From 071ff55f9dfe83a660e6f64b02feeb0d334fc533 Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Sun, 22 Dec 2013 18:38:54 +0000 Subject: [PATCH] allow users to specify options separately for the two daemons --- debian/autoradio.default | 5 +++-- debian/changelog | 6 ++++++ debian/services/radiod | 2 +- debian/services/redirectord | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/autoradio.default b/debian/autoradio.default index 213d271e..530e1f05 100644 --- a/debian/autoradio.default +++ b/debian/autoradio.default @@ -16,5 +16,6 @@ DOMAIN="" # Set the etcd servers to connect to (default: etcd.$DOMAIN). #ETCD_SERVER="" -# Additional options that are passed to the daemons. -DAEMON_OPTIONS="" +# Additional options that are passed to specific daemons. +RADIOD_OPTIONS="" +REDIRECTORD_OPTIONS="" diff --git a/debian/changelog b/debian/changelog index 9c118a35..cd52a0c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +autoradio (0.2-1) unstable; urgency=low + + * Fixes to packaging scripts. + + -- ale <ale@incal.net> Sun, 22 Dec 2013 18:36:23 +0000 + autoradio (0.2) unstable; urgency=low * Update to the etcd 0.2 API. diff --git a/debian/services/radiod b/debian/services/radiod index bbf8b4a3..a407f2e1 100755 --- a/debian/services/radiod +++ b/debian/services/radiod @@ -6,5 +6,5 @@ set_public_ip set_etcd_params exec chpst -u icecast2 \ - radiod --ip=${PUBLIC_IP} ${ETCD_OPTIONS} ${DAEMON_OPTIONS} \ + radiod --ip=${PUBLIC_IP} ${ETCD_OPTIONS} ${RADIOD_OPTIONS} \ 2>&1 diff --git a/debian/services/redirectord b/debian/services/redirectord index 165504c0..9f6fd220 100755 --- a/debian/services/redirectord +++ b/debian/services/redirectord @@ -7,5 +7,5 @@ set_etcd_params exec chpst -u nobody \ redirectord --ip=${PUBLIC_IP} --domain=${DOMAIN} \ - ${ETCD_OPTIONS} ${DAEMON_OPTIONS} \ + ${ETCD_OPTIONS} ${REDIRECTORD_OPTIONS} \ 2>&1 -- GitLab