Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix debian build
  • Loading branch information
Dmitry Vasilyev committed Jan 31, 2016
commit 0086a267dce2aa4f4c9f2b9d4303f98305796e78
16 changes: 9 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ before_install:
- docker pull debian:6

script:
# rpm build
- >
docker run -v $(pwd):/var/tmp centos:6 bash -c
"cd /var/tmp &&
yum install -y tar make rpm-build python2-devel python-setuptools &&
make rpm && rpm -i mamonsu*.rpm &&
/etc/init.d/mamonsu restart"
# deb build
- >
docker run -v $(pwd):/var/tmp debian:6 bash -c
"cd /var/tmp && apt-get update &&
Expand All @@ -23,11 +31,5 @@ script:
echo package mamonsu/postgres_query_timeout string '10' | debconf-set-selections &&
echo package mamonsu/log_level string 'INFO' | debconf-set-selections &&
apt-get install -y make dpkg-dev debhelper python-dev python-setuptools &&
make deb && DEBIAN_FRONTEND=noninteractive dpkg -i mamonsu*.deb &&
/etc/init.d/mamonsu restart"
- >
docker run -v $(pwd):/var/tmp centos:6 bash -c
"cd /var/tmp &&
yum install -y tar make rpm-build python2-devel python-setuptools &&
make rpm && rpm -i mamonsu*.rpm &&
make deb && dpkg -i mamonsu*.deb &&
/etc/init.d/mamonsu restart"
22 changes: 11 additions & 11 deletions debian/config
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CONFIGFILE=/etc/mamonsu/agent.conf

db_version 2.0
db_capb
db_title Configure mamonsu agent

HOSTNAME=$(hostname -f || 'locahost')

Expand All @@ -19,16 +20,15 @@ db_set mamonsu/postgres_port "5432"
db_set mamonsu/postgres_query_timeout "10"
db_set mamonsu/log_level "INFO"

db_title Configure mamonsu agent
db_input high mamonsu/zabbix_server
db_input high mamonsu/zabbix_client
db_input high mamonsu/postgres_user
db_input high mamonsu/postgres_password
db_input high mamonsu/postgres_database
db_input high mamonsu/postgres_host
db_input high mamonsu/postgres_port
db_input high mamonsu/postgres_query_timeout
db_input high mamonsu/log_level
db_input high mamonsu/zabbix_server || true
db_input high mamonsu/zabbix_client || true
db_input high mamonsu/postgres_user || true
db_input high mamonsu/postgres_password || true
db_input high mamonsu/postgres_database || true
db_input high mamonsu/postgres_host || true
db_input high mamonsu/postgres_port || true
db_input high mamonsu/postgres_query_timeout || true
db_input high mamonsu/log_level || true

db_go
db_go || true

1 change: 0 additions & 1 deletion debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ if [ "$1" = "configure" ]; then
addgroup --system --quiet mamonsu
fi
if ! getent passwd mamonsu > /dev/null 2>&1 ; then
# Not yet. Create it.
adduser --quiet \
--system --disabled-login --ingroup mamonsu \
--home /var/run/mamonsu/ --no-create-home \
Expand Down