[Debian-ha-commits] [corosync] 01/02: corosync.default, reintroduce START=[yes|no], config

[Adrian Vondendriesch]

This is an automated email from the git hooks/post-receive script.

discostu-guest pushed a commit to branch master
in repository corosync.

commit 161261870f8a7cada225fe69b06470762b56c5b7
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Wed May 6 20:36:38 2015 +0200

    corosync.default, reintroduce START=[yes|no], config
    
    - Update corosync.default to match environment variables supported by corosync.
    - Reintroduce START=[yes|no] condition within sysV init script.
    - Install corosync.conf
    
    Signed-off-by: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
---
 debian/changelog                                          | 6 ++----
 debian/corosync.default                                   | 9 +++++++++
 debian/{corosync.conf.example => corosync.example-config} | 0
 debian/corosync.init                                      | 7 +++----
 debian/rules                                              | 4 +---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a4e3ad..fdaabe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,12 +82,10 @@ corosync (2.3.4-1) UNRELEASED; urgency=medium
   * Add OPTIONS within /etc/default/corosync-notifyd
   * debian/corosync.example-config: create a new example-config based on
     current upstream version (Closes: #682532, #739730)
-  * Install debian/corosync.conf.example as example configuration
   * Install our own corosync.service file. The our new service file now calls
     corosync directly.
-  * Ged rid of START=[yes|no] within /etc/default/corosync. Instead check the
-    existence of /etc/corosync/corosync.conf. So corosync.service and
-    corosync.init uses the same start condition.
+  * debian/corosync.defaul: insert default environment values accepted by
+    corosync
 
  -- Richard B Winters <rik at mmogp.com>  Wed, 22 Apr 2015 15:51:34 -0400
 
diff --git a/debian/corosync.default b/debian/corosync.default
index 9e124a4..bd1d257 100644
--- a/debian/corosync.default
+++ b/debian/corosync.default
@@ -1,2 +1,11 @@
 # start corosync at boot [yes|no]
 START=no
+
+# Corosync runtime directory
+#COROSYNC_RUN_DIR=/var/lib/corosync
+
+# Path to corosync.conf
+#COROSYNC_MAIN_CONFIG_FILE=/etc/corosync/corosync.conf
+
+# Path to authfile
+#COROSYNC_TOTEM_AUTHKEY_FILE=/etc/corosync/authkey
diff --git a/debian/corosync.conf.example b/debian/corosync.example-config
similarity index 100%
rename from debian/corosync.conf.example
rename to debian/corosync.example-config
diff --git a/debian/corosync.init b/debian/corosync.init
index ad9d37a..9fab7ca 100644
--- a/debian/corosync.init
+++ b/debian/corosync.init
@@ -21,7 +21,6 @@ PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 PIDFILE=/var/run/corosync.pid
 RARUNDIR=/var/run/resource-agents
-CONFIGFILE=/etc/corosync/corosync.conf
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
@@ -32,9 +31,9 @@ CONFIGFILE=/etc/corosync/corosync.conf
 # Make sure the Resource Agents run dir exists. Otherwise create it.
 [ -d "$RARUNDIR" ] || mkdir -p $RARUNDIR
 
-# Instead of checking the START=... parameter, we check if our config file
-# exists.
-[ -f $CONFIGFILE ] || exit 0
+if [ "$START" != "yes" ]; then
+	exit 0
+fi
 
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
diff --git a/debian/rules b/debian/rules
index 307bf4b..a7ba9d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,11 +51,9 @@ override_dh_auto_install:
 	dh_auto_install
 # remove .la files
 	rm -v debian/tmp/usr/lib/lib*.la
-# remove corosync.service file
-	rm -v $(CURDIR)/debian/tmp/lib/systemd/system/corosync.service
 # install example configuration file
 	mkdir -p $(CURDIR)/debian/corosync/etc/corosync/
-	cp -ax $(CURDIR)/debian/corosync.conf.example $(CURDIR)/debian/corosync/etc/corosync/corosync.conf.example
+	cp -ax $(CURDIR)/debian/corosync.example-config $(CURDIR)/debian/corosync/etc/corosync/corosync.conf
 	rm "$(DOC)/LICENSE" "$(DOC)/INSTALL"
 
 override_dh_installinit:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/corosync.git