Rev 437: move config files to config/ directory in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 437
revision-id: tridge at samba.org-20070602094007-zqkiwbwx5ynm9nb2
parent: tridge at samba.org-20070602092348-08m7eh7xvcjtt3cs
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Sat 2007-06-02 19:40:07 +1000
message:
  move config files to config/ directory
removed:
  tools/monitor_recovery.sh      monitor_recovery.sh-20070508220533-oy7s689rcjsu7yte-1
added:
  config/                        config-20070602093657-5fnwti2hfflosh4f-1
renamed:
  packaging/ctdb.init => config/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6
  tools/ctdb.sysconfig => config/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
  tools/events => config/events events-20070529030121-04fjh63cxfh8v1pj-1
  tools/events.d => config/events.d events.d-20070601105340-vlcvnp6euoj3zdwy-1
  tools/functions => config/functions functions-20070601105405-gajwirydr5a9zd6x-1
  tools/statd-callout => config/statd-callout statdcallout-20070531010857-6sdlz455vusye5y5-1
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  packaging/RPM/ctdb.spec        ctdb.spec-20070527204758-biuh7znabuwan3zn-3
  config/ctdb.init               ctdb.init-20070527204758-biuh7znabuwan3zn-6
=== removed file 'tools/monitor_recovery.sh'
--- a/tools/monitor_recovery.sh	2007-05-29 02:16:59 +0000
+++ b/tools/monitor_recovery.sh	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-CTDB="./bin/ctdb"
-export CTDB
-
-$CTDB status | egrep "^vnn:" | sed -e "s/^vnn://" -e "s/ .*$//" | while read NODE; do
-	xterm -geometry 30x25 -e "watch -n1 \"$CTDB -n $NODE status\"" &
-done
-

=== added directory 'config'
=== renamed file 'packaging/ctdb.init' => 'config/ctdb.init'
--- a/packaging/ctdb.init	2007-06-02 08:51:05 +0000
+++ b/config/ctdb.init	2007-06-02 09:40:07 +0000
@@ -65,6 +65,7 @@
 fi
 
 start() {
+        killall -q ctdbd
 	echo -n $"Starting ctdbd service: "
 	case $init_style in
 	    suse)

=== renamed file 'tools/ctdb.sysconfig' => 'config/ctdb.sysconfig'
=== renamed file 'tools/events' => 'config/events'
=== renamed directory 'tools/events.d' => 'config/events.d'
=== renamed file 'tools/functions' => 'config/functions'
=== renamed file 'tools/statd-callout' => 'config/statd-callout'
=== modified file 'Makefile.in'
--- a/Makefile.in	2007-06-02 09:23:48 +0000
+++ b/Makefile.in	2007-06-02 09:40:07 +0000
@@ -108,12 +108,12 @@
 	install -m755 bin/ctdbd $(DESTDIR)$(sbindir)
 	install -m644 include/ctdb.h $(DESTDIR)$(includedir)
 	install -m644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
-	install -m755 tools/events $(DESTDIR)$(etcdir)/ctdb
-	install -m755 tools/functions $(DESTDIR)$(etcdir)/ctdb
-	install -m755 tools/statd-callout $(DESTDIR)$(etcdir)/ctdb
-	install -m755 tools/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 tools/events.d/nfs $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 tools/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
+	install -m755 config/events $(DESTDIR)$(etcdir)/ctdb
+	install -m755 config/functions $(DESTDIR)$(etcdir)/ctdb
+	install -m755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
+	install -m755 config/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d
+	install -m755 config/events.d/nfs $(DESTDIR)$(etcdir)/ctdb/events.d
+	install -m755 config/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
 	install -m755 tools/onnode.ssh $(DESTDIR)$(bindir)
 	install -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
 	cd $(DESTDIR)$(bindir) && ln -sf onnode.ssh onnode

=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec	2007-06-01 14:11:53 +0000
+++ b/packaging/RPM/ctdb.spec	2007-06-02 09:40:07 +0000
@@ -57,8 +57,8 @@
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-install -m644 tools/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
-install -m755 packaging/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
+install -m644 config/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
+install -m755 config/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
 
 # Remove "*.old" files
 find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;