[Debian-ha-commits] [corosync] 01/01: Add correct-example-conf-logging-path.

[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 e722fae0c3689585c90ed6bd00e5138e2891b26f
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Sun Jul 5 14:44:15 2015 +0200

    Add correct-example-conf-logging-path.
    
    Closes #739730.
    
    Signed-off-by: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
---
 debian/changelog                                 |  3 ++-
 debian/patches/correct-example-conf-logging-path | 25 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 439e6dc..0c6e66c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,10 +75,11 @@ corosync (2.3.4-1) UNRELEASED; urgency=medium
   * Add doxygen and graphviz, to Build-Depends. This is needed to build
     documentation.
   * Add myself to Uploaders.
-  * Install upstream systemd service files for corsync and corosync-notifyd.
+  * Install upstream systemd service files for corosync and corosync-notifyd.
   * debian/patches:
     - Patch upstream corosync-notifyd.service file
     - Use debian initscript within corosync.service
+    - Log to /var/log/corosync instead of /var/log/cluster (Closes: #739730)
   * Add OPTIONS within /etc/default/corosync-notifyd
   * debian/corosync.example-config: create a new example-config based on
     current upstream version (Closes: #682532, #739730)
diff --git a/debian/patches/correct-example-conf-logging-path b/debian/patches/correct-example-conf-logging-path
new file mode 100644
index 0000000..3024a1e
--- /dev/null
+++ b/debian/patches/correct-example-conf-logging-path
@@ -0,0 +1,25 @@
+Change logfilepath to /var/log/corosync instead of /var/log/cluster.
+This patch closes #739730 reported by Daniel Black
+<daniel.black at openquery.com.au>.
+--- a/conf/corosync.conf.example
++++ b/conf/corosync.conf.example
+@@ -59,7 +59,7 @@
+ 	# Log to a log file. When set to "no", the "logfile" option
+ 	# must not be set.
+ 	to_logfile: yes
+-	logfile: /var/log/cluster/corosync.log
++	logfile: /var/log/corosync/corosync.log
+ 	# Log to the system log daemon. When in doubt, set to yes.
+ 	to_syslog: yes
+ 	# Log debug messages (very verbose). When in doubt, leave off.
+--- a/conf/corosync.conf.example.udpu
++++ b/conf/corosync.conf.example.udpu
+@@ -18,7 +18,7 @@
+ 	fileline: off
+ 	to_logfile: yes
+ 	to_syslog: yes
+-	logfile: /var/log/cluster/corosync.log
++	logfile: /var/log/corosync/corosync.log
+ 	debug: off
+ 	timestamp: on
+ 	logger_subsys {
diff --git a/debian/patches/series b/debian/patches/series
index c542d5c..fc29756 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0011-Remove-deprecated-doxygen-flags.patch
 0012-Debianize-corosync-notifyd-systemd-service-file.patch
 0013-use-debian-sysv-initscript-in-corosync.service-file.patch
+correct-example-conf-logging-path

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