move config files to config/ directory

(This used to be ctdb commit f95de519b885c8e1f40df0cda70fd796e479a22a)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 8cae9a2940cadbc2c94c3fa18cb29d5bed50dbef..2770f8794f4cc1fe6d8ef48b234a41b2f44b3766 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -108,12 +108,12 @@ install: all
        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

diff --git a/ctdb/packaging/ctdb.init b/ctdb/config/ctdb.init
similarity index 99%
rename from ctdb/packaging/ctdb.init
rename to ctdb/config/ctdb.init
index 5852d826a9577297f95623c384b7397553794880..b0e33cf79f953794866295c8ac6e92b24e60da65 100755 (executable)
--- a/ctdb/packaging/ctdb.init
+++ b/ctdb/config/ctdb.init
@@ -65,6 +65,7 @@ else
 fi
 
 start() {
+        killall -q ctdbd
        echo -n $"Starting ctdbd service: "
        case $init_style in
            suse)

diff --git a/ctdb/tools/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
similarity index 100%
rename from ctdb/tools/ctdb.sysconfig
rename to ctdb/config/ctdb.sysconfig

diff --git a/ctdb/tools/events b/ctdb/config/events
similarity index 100%
rename from ctdb/tools/events
rename to ctdb/config/events

diff --git a/ctdb/tools/events.d/nfs b/ctdb/config/events.d/nfs
similarity index 100%
rename from ctdb/tools/events.d/nfs
rename to ctdb/config/events.d/nfs

diff --git a/ctdb/tools/events.d/nfslock b/ctdb/config/events.d/nfslock
similarity index 100%
rename from ctdb/tools/events.d/nfslock
rename to ctdb/config/events.d/nfslock

diff --git a/ctdb/tools/events.d/samba b/ctdb/config/events.d/samba
similarity index 100%
rename from ctdb/tools/events.d/samba
rename to ctdb/config/events.d/samba

diff --git a/ctdb/tools/functions b/ctdb/config/functions
similarity index 100%
rename from ctdb/tools/functions
rename to ctdb/config/functions

diff --git a/ctdb/tools/statd-callout b/ctdb/config/statd-callout
similarity index 100%
rename from ctdb/tools/statd-callout
rename to ctdb/config/statd-callout

diff --git a/ctdb/packaging/RPM/ctdb.spec b/ctdb/packaging/RPM/ctdb.spec
index 01e12bcccde236e0c5ca9a7bbbed60691465aba6..ef5622c55e6765b04328d14495c4c45cdc16ff92 100644 (file)
--- a/ctdb/packaging/RPM/ctdb.spec
+++ b/ctdb/packaging/RPM/ctdb.spec
@@ -57,8 +57,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 
 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 {} \;

diff --git a/ctdb/tools/monitor_recovery.sh b/ctdb/tools/monitor_recovery.sh
deleted file mode 100755 (executable)
index dcd2123..0000000
--- a/ctdb/tools/monitor_recovery.sh
+++ /dev/null
@@ -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
-