[Pkg-samba-maint] r1718 - in trunk/ctdb/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Thu Jan 24 16:16:23 UTC 2008
Author: mparent-guest
Date: 2008-01-24 16:16:23 +0000 (Thu, 24 Jan 2008)
New Revision: 1718
Removed:
trunk/ctdb/debian/patches/01_ctdb_log.diff
Modified:
trunk/ctdb/debian/changelog
trunk/ctdb/debian/ctdb.logrotate
trunk/ctdb/debian/patches/03_web.diff
trunk/ctdb/debian/patches/series
Log:
Remove log.ctdb patch, as suggested by Christian Perrier
Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog 2008-01-24 15:30:52 UTC (rev 1717)
+++ trunk/ctdb/debian/changelog 2008-01-24 16:16:23 UTC (rev 1718)
@@ -1,12 +1,12 @@
-ctdb (0~20080104223653-1) unstable; urgency=low
+ctdb (1.0.24.200801221422-1) unstable; urgency=low
* Initial release (Closes: #460114)
- * 01_ctdb_log.diff : change log file path from /var/log/log.ctdb to /var/log/ctdb/ctdb.log
* 02_ctdb_diagnostics.diff : adapt ctdb_diagnostics to debian
* 03_web.diff : correct various paths in documentation
- * 04_install_chmod.patch : correct Makefile to install proper execution permissions
+ * 04_install_chmod.patch : correct Makefile to install proper execution
+ permissions
* init script with start/stop/status
- * logrotate for /var/log/ctdb/ctdb.log
+ * logrotate for /var/log/log.ctdb
-- Mathieu PARENT <math.parent at gmail.com> Tue, 15 Jan 2008 23:16:44 +0100
Modified: trunk/ctdb/debian/ctdb.logrotate
===================================================================
--- trunk/ctdb/debian/ctdb.logrotate 2008-01-24 15:30:52 UTC (rev 1717)
+++ trunk/ctdb/debian/ctdb.logrotate 2008-01-24 16:16:23 UTC (rev 1718)
@@ -1,4 +1,4 @@
-/var/log/ctdb/ctdb.log {
+/var/log/log.ctdb {
weekly
missingok
rotate 7
Deleted: trunk/ctdb/debian/patches/01_ctdb_log.diff
===================================================================
--- trunk/ctdb/debian/patches/01_ctdb_log.diff 2008-01-24 15:30:52 UTC (rev 1717)
+++ trunk/ctdb/debian/patches/01_ctdb_log.diff 2008-01-24 16:16:23 UTC (rev 1718)
@@ -1,92 +0,0 @@
-Goal: change log file path from /var/log/log.ctdb to /var/log/ctdb/ctdb.log
-
-This allows multiples logs (ctdb.log.pnn%u) and logrotate.
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: specific to debian
-
-Index: ctdb-0~20080104223653/config/ctdb.sysconfig
-===================================================================
---- ctdb-0~20080104223653.orig/config/ctdb.sysconfig 2008-01-20 21:36:49.000000000 +0100
-+++ ctdb-0~20080104223653/config/ctdb.sysconfig 2008-01-20 21:37:13.000000000 +0100
-@@ -69,8 +69,8 @@
- # CTDB_TRANSPORT="tcp"
-
- # where to log messages
--# the default is /var/log/log.ctdb
--# CTDB_LOGFILE=/var/log/log.ctdb
-+# the default is /var/log/ctdb/ctdb.log
-+# CTDB_LOGFILE=/var/log/ctdb/ctdb.log
-
- # what debug level to run at. Higher means more verbose
- # the default is 0
-Index: ctdb-0~20080104223653/doc/ctdbd.1
-===================================================================
---- ctdb-0~20080104223653.orig/doc/ctdbd.1 2008-01-20 21:37:52.000000000 +0100
-+++ ctdb-0~20080104223653/doc/ctdbd.1 2008-01-20 21:38:15.000000000 +0100
-@@ -80,7 +80,7 @@
- .PP
- \-\-logfile=<filename>
- .RS 3n
--This is the file where ctdbd will write its log. This is usually /var/log/log.ctdb .
-+This is the file where ctdbd will write its log. This is usually /var/log/ctdb/ctdb.log .
- .RE
- .PP
- \-\-listen=<address>
-Index: ctdb-0~20080104223653/doc/onnode.1
-===================================================================
---- ctdb-0~20080104223653.orig/doc/onnode.1 2008-01-20 21:37:29.000000000 +0100
-+++ ctdb-0~20080104223653/doc/onnode.1 2008-01-20 21:37:45.000000000 +0100
-@@ -39,7 +39,7 @@
- .sp
- .RS 4
- .nf
--onnode all "hostname; tail \-5 /var/log/log.ctdb"
-+onnode all "hostname; tail \-5 /var/log/ctdb/ctdb.log"
-
- .fi
- .RE
-Index: ctdb-0~20080104223653/server/ctdbd.c
-===================================================================
---- ctdb-0~20080104223653.orig/server/ctdbd.c 2008-01-20 21:38:37.000000000 +0100
-+++ ctdb-0~20080104223653/server/ctdbd.c 2008-01-20 21:39:30.000000000 +0100
-@@ -56,7 +56,7 @@
- .nlist = ETCDIR "/ctdb/nodes",
- .transport = "tcp",
- .event_script_dir = ETCDIR "/ctdb/events.d",
-- .logfile = VARDIR "/log/log.ctdb",
-+ .logfile = VARDIR "/log/ctdb/ctdb.log",
- .db_dir = VARDIR "/ctdb",
- .db_dir_persistent = VARDIR "/ctdb/persistent",
- };
-@@ -274,7 +274,7 @@
-
- /* useful default logfile */
- if (ctdb->logfile == NULL) {
-- char *name = talloc_asprintf(ctdb, "%s/log.ctdb.pnn%u",
-+ char *name = talloc_asprintf(ctdb, "%s/ctdb/ctdb.log.pnn%u",
- VARDIR, ctdb->pnn);
- ctdb_set_logfile(ctdb, name);
- talloc_free(name);
-Index: ctdb-0~20080104223653/tools/ctdb_diagnostics
-===================================================================
---- ctdb-0~20080104223653.orig/tools/ctdb_diagnostics 2008-01-20 21:39:44.000000000 +0100
-+++ ctdb-0~20080104223653/tools/ctdb_diagnostics 2008-01-20 21:40:21.000000000 +0100
-@@ -102,11 +102,11 @@
- show_all "ctdb status; ctdb ip"
- show_all "ctdb statistics"
-
--echo "Showing log.ctdb"
--show_all "tail -100 /var/log/log.ctdb"
-+echo "Showing ctdb.log"
-+show_all "tail -100 /var/log/ctdb/ctdb.log"
-
--echo "Showing log.ctdb"
--show_all "tail -100 /var/log/log.ctdb"
-+echo "Showing ctdb.log"
-+show_all "tail -100 /var/log/ctdb/ctdb.log"
-
-
- cat <<EOF
-Index: ctdb-0~20080104223653/web/testing.html
Modified: trunk/ctdb/debian/patches/03_web.diff
===================================================================
--- trunk/ctdb/debian/patches/03_web.diff 2008-01-24 15:30:52 UTC (rev 1717)
+++ trunk/ctdb/debian/patches/03_web.diff 2008-01-24 16:16:23 UTC (rev 1718)
@@ -78,24 +78,3 @@
When this parameter is set to "yes" CTDB will start/stop/restart the local winbind daemon as the cluster configuration changes.<br><br>
When this parameter is set you should also make sure that winbind is NOT started by default by the linux system when it boots:
<pre>
-===================================================================
---- ctdb-0~20080104223653.orig/web/testing.html 2008-01-20 21:40:36.000000000 +0100
-+++ ctdb-0~20080104223653/web/testing.html 2008-01-20 21:41:28.000000000 +0100
-@@ -3,7 +3,7 @@
-
- <H2 align="center">Starting and testing CTDB</h2>
-
--The CTDB log is in /var/log/log.ctdb so look in this file if something
-+The CTDB log is in /var/log/ctdb/ctdb.log so look in this file if something
- did not start correctly.<p>
-
- You can ensure that ctdb is running on all nodes using
-@@ -84,7 +84,7 @@
-
- If the cluster remains in RECOVERY state for very long (many seconds)
- there might be something wrong with the configuration. See
--/var/log/log.ctdb.
-+/var/log/ctdb/ctdb.log.
-
- <h3>ctdb ip</h3>
-
Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series 2008-01-24 15:30:52 UTC (rev 1717)
+++ trunk/ctdb/debian/patches/series 2008-01-24 16:16:23 UTC (rev 1718)
@@ -1,4 +1,3 @@
-01_ctdb_log.diff
02_ctdb_diagnostics.diff
03_web.diff
04_install_chmod.patch
More information about the Pkg-samba-maint
mailing list