Filippo Giunchedi has submitted this change and it was merged.
Change subject: zuul: provide sane defaults in init scripts
......................................................................
zuul: provide sane defaults in init scripts
Filippo Giunchedi pointed we should not exit when a default file is
missing but instead provide sane default.
Add to the init script sane defaults to be overriden via the default
file:
START_DAEMON=0
DAEMON_ARGS=0
Our default files (in puppet templates) do have START_DAEMON=1 so no
impact for us.
Change-Id: I2fa45c3d0e46d1346d1906a48bd174b458a5b0c1
---
M modules/zuul/files/zuul-merger.init
M modules/zuul/files/zuul.init
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/zuul/files/zuul-merger.init
b/modules/zuul/files/zuul-merger.init
index f8470a5..db5b98a 100755
--- a/modules/zuul/files/zuul-merger.init
+++ b/modules/zuul/files/zuul-merger.init
@@ -23,7 +23,8 @@
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
-START_DAEMON=1
+START_DAEMON=0
+DAEMON_ARGS=''
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
@@ -35,10 +36,6 @@
# Read configuration variable file if it is present
if [ -r /etc/default/$NAME ] ; then
. /etc/default/$NAME
-else
- log_daemon_msg "$DESC: /etc/default/$NAME not found: exiting"
- log_end_msg 1
- exit 0
fi
if ! [ "${START_DAEMON}" = "1" ] ; then
diff --git a/modules/zuul/files/zuul.init b/modules/zuul/files/zuul.init
index 20ec8ad..2beb988 100755
--- a/modules/zuul/files/zuul.init
+++ b/modules/zuul/files/zuul.init
@@ -23,7 +23,8 @@
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
-START_DAEMON=1
+START_DAEMON=0
+DAEMON_ARGS=''
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
@@ -35,10 +36,6 @@
# Read configuration variable file if it is present
if [ -r /etc/default/$NAME ] ; then
. /etc/default/$NAME
-else
- log_daemon_msg "$DESC: /etc/default/$NAME not found: exiting"
- log_end_msg 1
- exit 0
fi
if ! [ "${START_DAEMON}" = "1" ] ; then
--
To view, visit https://gerrit.wikimedia.org/r/199861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fa45c3d0e46d1346d1906a48bd174b458a5b0c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
