[25455] in Source-Commits
/svn/athena r24998 - trunk/third/moira/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Mar 2 16:57:14 2011
Date: Wed, 2 Mar 2011 16:57:07 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103022157.p22Lv7Hv003145@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-02 16:57:07 -0500 (Wed, 02 Mar 2011)
New Revision: 24998
Added:
trunk/third/moira/debian/debathena-moira-update-server.default
Modified:
trunk/third/moira/debian/changelog
trunk/third/moira/debian/debathena-moira-update-server.init
Log:
In moira:
* Add debathena-moira-update-server.default file
* Do not start daemon unless enabled in aforementioned file
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2011-03-02 19:37:12 UTC (rev 24997)
+++ trunk/third/moira/debian/changelog 2011-03-02 21:57:07 UTC (rev 24998)
@@ -1,3 +1,10 @@
+debathena-moira (4.0.0+svn20100405-0debathena2) unstable; urgency=low
+
+ * Add debathena-moira-update-server.default file
+ * Do not start daemon unless enabled in aforementioned file
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 02 Mar 2011 16:56:27 -0500
+
debathena-moira (4.0.0+svn20100405-0debathena1) unstable; urgency=low
* New SVN snapshot.
Added: trunk/third/moira/debian/debathena-moira-update-server.default
===================================================================
--- trunk/third/moira/debian/debathena-moira-update-server.default (rev 0)
+++ trunk/third/moira/debian/debathena-moira-update-server.default 2011-03-02 21:57:07 UTC (rev 24998)
@@ -0,0 +1,8 @@
+# Defaults for debathena-moira-update-server
+
+# Arguments for /usr/sbin/update_server
+DAEMON_ARGS=""
+
+# Enabled by default?
+# Values: false, true
+ENABLED=false
Modified: trunk/third/moira/debian/debathena-moira-update-server.init
===================================================================
--- trunk/third/moira/debian/debathena-moira-update-server.init 2011-03-02 19:37:12 UTC (rev 24997)
+++ trunk/third/moira/debian/debathena-moira-update-server.init 2011-03-02 21:57:07 UTC (rev 24998)
@@ -21,6 +21,7 @@
DAEMON=/usr/sbin/update_server
DAEMON_ARGS=""
SCRIPTNAME=/etc/init.d/$NAME
+ENABLED=false
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
@@ -28,6 +29,9 @@
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+# Exit if the daemon has not been enabled
+[ "$ENABLED" = true ] || exit 0
+
# Load the VERBOSE setting and other rcS variables
[ -f /etc/default/rcS ] && . /etc/default/rcS
