Fix traceback on bcfg2-server install. Make bcfg2-server not start up on

install or by default at startup, to match behavior of bcfg2 client and not
surprise the admin - also starting up bcfg2-server will just fail as
currently the package does not install a working basic server configuration -
this may be a debian policy bug - the user has to manually do
bcfg2-admin init as root after install on clean installs.



git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5545 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 10 insertions, 1 deletions

diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init
index d8ed2e908..7f760bd75 100644
--- a/debian/bcfg2-server.init
+++ b/debian/bcfg2-server.init
@@ -20,6 +20,15 @@ DAEMON=/usr/sbin/bcfg2-server
 PIDFILE=/var/run/bcfg2-server.pid
 PARAMS="-D $PIDFILE"
 
+# Disabled per default
+BCFG2_SERVER_OPTIONS=""
+BCFG2_SERVER_ENABLED=0
+
+# Include default startup configuration if exists
+test -f "/etc/default/bcfg2-server" && . /etc/default/bcfg2-server
+
+[ "$BCFG2_SERVER_ENABLED" -eq 0 ] && exit 0
+
 # Exit if $DAEMON doesn't exist and is not executable
 test -x $DAEMON || exit 5
 
@@ -31,7 +40,7 @@ BINARY=$(basename $DAEMON)
 
 start () {
     echo -n "Starting Configuration Management Server: "
-    start_daemon ${DAEMON} ${PARAMS}
+    start_daemon ${DAEMON} ${PARAMS} ${BCFG2_SERVER_OPTIONS}
     STATUS=$?
     if [ "$STATUS" = 0 ]
     then