[Pkg-samba-maint] r1703 - in trunk/ctdb/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Sun Jan 20 21:13:28 UTC 2008
Author: mparent-guest
Date: 2008-01-20 21:13:28 +0000 (Sun, 20 Jan 2008)
New Revision: 1703
Added:
trunk/ctdb/debian/patches/
trunk/ctdb/debian/patches/01_ctdb_log.diff
trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff
trunk/ctdb/debian/patches/03_web.diff
trunk/ctdb/debian/patches/series
Modified:
trunk/ctdb/debian/control
trunk/ctdb/debian/ctdb.TODO
trunk/ctdb/debian/rules
Log:
Patches :
* create /var/log/ctdb/
* log file : /var/log/log.ctdb -> /var/log/ctdb/ctdb.log
* config in docs : /etc/sysconfig -> /etc/default
* corresponding dependency : quilt
Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control 2008-01-20 16:05:45 UTC (rev 1702)
+++ trunk/ctdb/debian/control 2008-01-20 21:13:28 UTC (rev 1703)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Mathieu PARENT <math.parent at gmail.com>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Homepage: http://ctdb.samba.org/
Standards-Version: 3.7.3
XS-DM-Upload-Allowed: yes
Modified: trunk/ctdb/debian/ctdb.TODO
===================================================================
--- trunk/ctdb/debian/ctdb.TODO 2008-01-20 16:05:45 UTC (rev 1702)
+++ trunk/ctdb/debian/ctdb.TODO 2008-01-20 21:13:28 UTC (rev 1703)
@@ -1,4 +1,3 @@
-* patch file and directory path in ctdb_diagnostics
* missing man pages (report upstream)
W: ctdb: binary-without-manpage usr/bin/ctdb_diagnostics
W: ctdb: binary-without-manpage usr/bin/ctdb_ipmux
Added: trunk/ctdb/debian/patches/01_ctdb_log.diff
===================================================================
--- trunk/ctdb/debian/patches/01_ctdb_log.diff (rev 0)
+++ trunk/ctdb/debian/patches/01_ctdb_log.diff 2008-01-20 21:13:28 UTC (rev 1703)
@@ -0,0 +1,84 @@
+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
Added: trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff
===================================================================
--- trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff (rev 0)
+++ trunk/ctdb/debian/patches/02_ctdb_diagnostics.diff 2008-01-20 21:13:28 UTC (rev 1703)
@@ -0,0 +1,26 @@
+Index: ctdb-0~20080104223653/tools/ctdb_diagnostics
+===================================================================
+--- ctdb-0~20080104223653.orig/tools/ctdb_diagnostics 2008-01-20 21:45:53.000000000 +0100
++++ ctdb-0~20080104223653/tools/ctdb_diagnostics 2008-01-20 21:58:10.000000000 +0100
+@@ -4,7 +4,7 @@
+
+ PATH="$PATH:/sbin:/usr/sbin:/usr/lpp/mmfs/bin"
+
+-CONFIG_FILES="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/sysconfig/ctdb /etc/ctdb/public_addresses /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/sysconfig/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
++CONFIG_FILES="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/default/ctdb /etc/ctdb/public_addresses /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/sysconfig/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
+
+ 2>&1
+
+@@ -90,8 +90,10 @@
+ Showing software versions
+ EOF
+ show_all "uname -a"
+-[ -x /bin/rpm ] && {
+- show_all "rpm -qa | egrep 'samba|ctdb|gpfs'"
++[ -x /usr/bin/dpkg-query ] && {
++ show_all "/usr/bin/dpkg-query --show 'ctdb'"
++ show_all "/usr/bin/dpkg-query --show 'samba'"
++ #show_all "/usr/bin/dpkg-query --show 'gpfs'"
+ }
+
+
Added: trunk/ctdb/debian/patches/03_web.diff
===================================================================
--- trunk/ctdb/debian/patches/03_web.diff (rev 0)
+++ trunk/ctdb/debian/patches/03_web.diff 2008-01-20 21:13:28 UTC (rev 1703)
@@ -0,0 +1,91 @@
+Index: ctdb-0~20080104223653/web/configuring.html
+===================================================================
+--- ctdb-0~20080104223653.orig/web/configuring.html 2008-01-20 22:03:20.000000000 +0100
++++ ctdb-0~20080104223653/web/configuring.html 2008-01-20 22:03:39.000000000 +0100
+@@ -25,12 +25,12 @@
+ config files for CTDB are also available from
+ <a href="http://samba.org/~tridge/ctdb/config">http://samba.org/~tridge/ctdb/config</a>
+
+-<h3>/etc/sysconfig/ctdb</h3>
++<h3>/etc/default/ctdb</h3>
+
+ This file contains the startup parameters for ctdb.<p>
+
+ When you installed ctdb, a template config file should have been
+-installed in /etc/sysconfig/ctdb.<p>
++installed in /etc/default/ctdb.<p>
+
+ Edit this file, following the instructions in the template.<p>
+
+Index: ctdb-0~20080104223653/web/ftp.html
+===================================================================
+--- ctdb-0~20080104223653.orig/web/ftp.html 2008-01-20 22:04:01.000000000 +0100
++++ ctdb-0~20080104223653/web/ftp.html 2008-01-20 22:04:18.000000000 +0100
+@@ -13,9 +13,9 @@
+ Configure vsftpd on each node on the cluster.<br><br>
+ Set up vsftpd to export directories from the shared cluster filesystem.
+
+-<h2>/etc/sysconfig/vsftpd</h2>
++<h2>/etc/default/vsftpd</h2>
+
+-Create the file /etc/sysconfig/vsftpd with the content :
++Create the file /etc/default/vsftpd with the content :
+ <pre>
+ CTDB_MANAGES_VSFTPD=yes
+ </pre>
+Index: ctdb-0~20080104223653/web/nfs.html
+===================================================================
+--- ctdb-0~20080104223653.orig/web/nfs.html 2008-01-20 22:03:48.000000000 +0100
++++ ctdb-0~20080104223653/web/nfs.html 2008-01-20 22:03:58.000000000 +0100
+@@ -25,7 +25,7 @@
+ /gpfs0/data *(rw,fsid=1235)
+ </pre>
+
+-<h2>/etc/sysconfig/nfs</h2>
++<h2>/etc/default/nfs</h2>
+
+ This file must be edited to point statd to keep its state directory on
+ shared storage instead of in a local directory.<br><br>
+Index: ctdb-0~20080104223653/web/samba.html
+===================================================================
+--- ctdb-0~20080104223653.orig/web/samba.html 2008-01-20 22:02:51.000000000 +0100
++++ ctdb-0~20080104223653/web/samba.html 2008-01-20 22:03:12.000000000 +0100
+@@ -63,7 +63,7 @@
+
+
+ <h3>CTDB_MANAGES_SAMBA</h3>
+-This is a parameter in /etc/sysconfig/ctdb<br><br>
++This is a parameter in /etc/default/ctdb<br><br>
+ When this parameter is set to "yes" CTDB will start/stop/restart the local samba daemon as the cluster configuration changes.<br><br>
+ When this parameter is set you should also make sure that samba is NOT started by default by the linux system when it boots:
+ <pre>
+@@ -78,7 +78,7 @@
+ It is strongly recommended that you set this parameter to "yes" if you intend to use clustered samba.
+
+ <h3>CTDB_MANAGES_WINBIND</h3>
+-This is a parameter in /etc/sysconfig/ctdb<br><br>
++This is a parameter in /etc/default/ctdb<br><br>
+ 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>
+
Added: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series (rev 0)
+++ trunk/ctdb/debian/patches/series 2008-01-20 21:13:28 UTC (rev 1703)
@@ -0,0 +1,3 @@
+01_ctdb_log.diff
+02_ctdb_diagnostics.diff
+03_web.diff
Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules 2008-01-20 16:05:45 UTC (rev 1702)
+++ trunk/ctdb/debian/rules 2008-01-20 21:13:28 UTC (rev 1703)
@@ -34,6 +34,8 @@
CFLAGS += -O2
endif
+include /usr/share/quilt/quilt.make
+
DESTDIR=$(CURDIR)/debian/ctdb
conf_args = \
@@ -41,7 +43,7 @@
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var
-configure: configure-stamp
+configure: patch configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
@@ -65,7 +67,9 @@
#$(MAKE) doc
touch $@
-clean:
+clean: clean-patched unpatch
+
+clean-patched:
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
@@ -98,7 +102,8 @@
# Create the target build directory hierarchy
mkdir -p $(DESTDIR)/etc/init.d
- mkdir -p $(DESTDIR)/etc/default/
+ mkdir -p $(DESTDIR)/etc/default
+ mkdir -p $(DESTDIR)/var/log/ctdb
# Add here commands to install the arch part of the package into
# debian/tmp.
$(MAKE) DESTDIR=$(DESTDIR) install
@@ -144,4 +149,4 @@
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch
More information about the Pkg-samba-maint
mailing list