ctdb-conf: Move all conf files to new conf/ subdirectory

Leave common/conf.[ch] where they are to make this commit
comprehensible.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/ctdb/cluster/cluster_conf.c b/ctdb/conf/cluster_conf.c
similarity index 99%
rename from ctdb/cluster/cluster_conf.c
rename to ctdb/conf/cluster_conf.c
index bdd64ba112f25c1b243ee9c999bc12d4284308e6..a5cebf46ea0eb065366f411df231aeeb761f73b9 100644 (file)
--- a/ctdb/cluster/cluster_conf.c
+++ b/ctdb/conf/cluster_conf.c
@@ -24,7 +24,7 @@
 
 #include "common/conf.h"
 
-#include "cluster_conf.h"
+#include "conf/cluster_conf.h"
 
 #define CLUSTER_TRANSPORT_DEFAULT "tcp"
 

diff --git a/ctdb/cluster/cluster_conf.h b/ctdb/conf/cluster_conf.h
similarity index 100%
rename from ctdb/cluster/cluster_conf.h
rename to ctdb/conf/cluster_conf.h

diff --git a/ctdb/common/conf_tool.c b/ctdb/conf/conf_tool.c
similarity index 96%
rename from ctdb/common/conf_tool.c
rename to ctdb/conf/conf_tool.c
index 2d0543d643e3452c350d0fca732af378848693b3..797d9c77630201d073a63681264dfac52f7be9ce 100644 (file)
--- a/ctdb/common/conf_tool.c
+++ b/ctdb/conf/conf_tool.c
@@ -28,14 +28,14 @@
 #include "common/conf.h"
 #include "common/path.h"
 
-#include "common/logging_conf.h"
-#include "cluster/cluster_conf.h"
-#include "database/database_conf.h"
-#include "event/event_conf.h"
-#include "failover/failover_conf.h"
-#include "server/legacy_conf.h"
-
-#include "common/conf_tool.h"
+#include "conf/logging_conf.h"
+#include "conf/cluster_conf.h"
+#include "conf/database_conf.h"
+#include "conf/event_conf.h"
+#include "conf/failover_conf.h"
+#include "conf/legacy_conf.h"
+
+#include "conf/conf_tool.h"
 
 struct conf_tool_context {
        struct cmdline_context *cmdline;

diff --git a/ctdb/common/conf_tool.h b/ctdb/conf/conf_tool.h
similarity index 100%
rename from ctdb/common/conf_tool.h
rename to ctdb/conf/conf_tool.h

diff --git a/ctdb/server/ctdb_config.c b/ctdb/conf/ctdb_config.c
similarity index 95%
rename from ctdb/server/ctdb_config.c
rename to ctdb/conf/ctdb_config.c
index 3f61fdae169e63364c5cb52bfe5b5cad8f3acad8..a97dfd59284acb0fa5860b9be84ccb1e879e06d6 100644 (file)
--- a/ctdb/server/ctdb_config.c
+++ b/ctdb/conf/ctdb_config.c
@@ -21,17 +21,17 @@
 
 #include "lib/util/debug.h"
 
-#include "common/conf.h"
-#include "common/logging_conf.h"
 #include "common/path.h"
+#include "common/conf.h"
 
-#include "cluster/cluster_conf.h"
-#include "database/database_conf.h"
-#include "event/event_conf.h"
-#include "failover/failover_conf.h"
-#include "legacy_conf.h"
+#include "conf/logging_conf.h"
+#include "conf/cluster_conf.h"
+#include "conf/database_conf.h"
+#include "conf/event_conf.h"
+#include "conf/failover_conf.h"
+#include "conf/legacy_conf.h"
 
-#include "ctdb_config.h"
+#include "conf/ctdb_config.h"
 
 struct ctdb_config ctdb_config;
 

diff --git a/ctdb/server/ctdb_config.h b/ctdb/conf/ctdb_config.h
similarity index 100%
rename from ctdb/server/ctdb_config.h
rename to ctdb/conf/ctdb_config.h

diff --git a/ctdb/database/database_conf.c b/ctdb/conf/database_conf.c
similarity index 99%
rename from ctdb/database/database_conf.c
rename to ctdb/conf/database_conf.c
index 4c7cb2d9ffe55f8cf0f378e3e92e0a34e61dd6f2..78510e0f2cd924b81572843995655b7a06fca888 100644 (file)
--- a/ctdb/database/database_conf.c
+++ b/ctdb/conf/database_conf.c
@@ -32,7 +32,7 @@
 #include "common/conf.h"
 #include "common/path.h"
 
-#include "database_conf.h"
+#include "conf/database_conf.h"
 
 #define DATABASE_CONF_VOLATILE_DB_DIR_DEFAULT   CTDB_VARDIR "/volatile"
 #define DATABASE_CONF_PERSISTENT_DB_DIR_DEFAULT CTDB_VARDIR "/persistent"

diff --git a/ctdb/database/database_conf.h b/ctdb/conf/database_conf.h
similarity index 100%
rename from ctdb/database/database_conf.h
rename to ctdb/conf/database_conf.h

diff --git a/ctdb/event/event_conf.c b/ctdb/conf/event_conf.c
similarity index 98%
rename from ctdb/event/event_conf.c
rename to ctdb/conf/event_conf.c
index 61ecf8e33eb6f73b9c14c0f6410261ef82b49302..8bb2c1dab49c9e9945b18564d104561e54acb800 100644 (file)
--- a/ctdb/event/event_conf.c
+++ b/ctdb/conf/event_conf.c
@@ -26,7 +26,7 @@
 #include "common/conf.h"
 #include "common/path.h"
 
-#include "event/event_conf.h"
+#include "conf/event_conf.h"
 
 static bool event_conf_validate_debug_script(const char *key,
                                             const char *old_script,

diff --git a/ctdb/event/event_conf.h b/ctdb/conf/event_conf.h
similarity index 100%
rename from ctdb/event/event_conf.h
rename to ctdb/conf/event_conf.h

diff --git a/ctdb/failover/failover_conf.c b/ctdb/conf/failover_conf.c
similarity index 97%
rename from ctdb/failover/failover_conf.c
rename to ctdb/conf/failover_conf.c
index 0f199cbcd6cc2c0a50cc805a68e139032f375f4a..90d0a0ab6d96bd182f34e78fe0526e6b3fcb00a2 100644 (file)
--- a/ctdb/failover/failover_conf.c
+++ b/ctdb/conf/failover_conf.c
@@ -23,7 +23,7 @@
 
 #include "common/conf.h"
 
-#include "failover/failover_conf.h"
+#include "conf/failover_conf.h"
 
 static bool check_static_boolean_change(const char *key,
                                        bool old_value,

diff --git a/ctdb/failover/failover_conf.h b/ctdb/conf/failover_conf.h
similarity index 100%
rename from ctdb/failover/failover_conf.h
rename to ctdb/conf/failover_conf.h

diff --git a/ctdb/server/legacy_conf.c b/ctdb/conf/legacy_conf.c
similarity index 98%
rename from ctdb/server/legacy_conf.c
rename to ctdb/conf/legacy_conf.c
index 3391a3bdb54f38959fc5462dffd803d33adab2ce..56cc5bce2da737f8afa797e30d78cba2319f6189 100644 (file)
--- a/ctdb/server/legacy_conf.c
+++ b/ctdb/conf/legacy_conf.c
@@ -24,7 +24,7 @@
 #include "common/conf.h"
 #include "common/logging.h"
 
-#include "legacy_conf.h"
+#include "conf/legacy_conf.h"
 
 #define LEGACY_SCRIPT_LOG_LEVEL_DEFAULT "ERROR"
 

diff --git a/ctdb/server/legacy_conf.h b/ctdb/conf/legacy_conf.h
similarity index 100%
rename from ctdb/server/legacy_conf.h
rename to ctdb/conf/legacy_conf.h

diff --git a/ctdb/common/logging_conf.c b/ctdb/conf/logging_conf.c
similarity index 98%
rename from ctdb/common/logging_conf.c
rename to ctdb/conf/logging_conf.c
index 38b3003a3f7a8c1106c2c7ec20a64d0a3a1b9454..f5071485ca31415f6e2af7131b8cef56d71fddfa 100644 (file)
--- a/ctdb/common/logging_conf.c
+++ b/ctdb/conf/logging_conf.c
@@ -23,7 +23,8 @@
 
 #include "common/conf.h"
 #include "common/logging.h"
-#include "common/logging_conf.h"
+
+#include "conf/logging_conf.h"
 
 #define LOGGING_LOCATION_DEFAULT       "file:" LOGDIR "/log.ctdb"
 #define LOGGING_LOG_LEVEL_DEFAULT      "NOTICE"

diff --git a/ctdb/common/logging_conf.h b/ctdb/conf/logging_conf.h
similarity index 100%
rename from ctdb/common/logging_conf.h
rename to ctdb/conf/logging_conf.h

diff --git a/ctdb/event/event_config.c b/ctdb/event/event_config.c
index d2826225c8048fbbcfb555b132421165e24a0db6..81c475c68ca2d73816884fa2720f228c066b1613 100644 (file)
--- a/ctdb/event/event_config.c
+++ b/ctdb/event/event_config.c
@@ -22,11 +22,12 @@
 #include <talloc.h>
 
 #include "common/conf.h"
-#include "common/logging_conf.h"
 #include "common/path.h"
 
+#include "conf/logging_conf.h"
+#include "conf/event_conf.h"
+
 #include "event/event_private.h"
-#include "event/event_conf.h"
 
 struct event_config {
        char *config_file;

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index e2cb9165c71ac08a3719329b346c1e6a24e344df..8d03062b97a89b050040d02038e496abf10b2737 100644 (file)
--- a/ctdb/server/ctdb_ltdb_server.c
+++ b/ctdb/server/ctdb_ltdb_server.c
@@ -41,7 +41,7 @@
 #include "common/common.h"
 #include "common/logging.h"
 
-#include "server/ctdb_config.h"
+#include "conf/ctdb_config.h"
 
 #define PERSISTENT_HEALTH_TDB "persistent_health.tdb"
 

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 0bcc4d33f8dd11d17e1f44cb536d307c49e3f95a..3f71c07d05dea8557fbb7cf4b7c3b3d4a693323e 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -44,7 +44,7 @@
 #include "common/common.h"
 #include "common/logging.h"
 
-#include "server/ctdb_config.h"
+#include "conf/ctdb_config.h"
 
 #include "ctdb_cluster_mutex.h"
 

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 0f7ac756497e4b3a907f1e0e7eb84b1ccecaa3ff..2176c6ab80611b219867c6f0c84f20656167a51a 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -45,7 +45,7 @@
 #include "common/common.h"
 #include "common/logging.h"
 
-#include "server/ctdb_config.h"
+#include "conf/ctdb_config.h"
 
 #include "server/ipalloc.h"
 

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index a388bff1598e4bbd70812f3a585518143faa2894..2aab243a463e562b11a2138aefcf2526f7d88993 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -40,9 +40,9 @@
 #include "common/common.h"
 #include "common/path.h"
 #include "common/logging.h"
-#include "common/logging_conf.h"
 
-#include "ctdb_config.h"
+#include "conf/logging_conf.h"
+#include "conf/ctdb_config.h"
 
 int script_log_level;
 bool fast_start;

diff --git a/ctdb/wscript b/ctdb/wscript
index 3fbdf7d042568293f5272a8b42d2831323091f97..0122ecb294ea38ee47d128113a14df9f7851f8e9 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -466,10 +466,6 @@ def build(bld):
                                 popt
                              ''')
 
-    bld.SAMBA_SUBSYSTEM('ctdb-logging-conf',
-                        source='common/logging_conf.c',
-                        deps='ctdb-util talloc')
-
     bld.SAMBA_SUBSYSTEM('ctdb-protocol-basic',
                         source=bld.SUBDIR('protocol', 'protocol_basic.c'),
                         deps='talloc tdb')
@@ -534,35 +530,21 @@ def build(bld):
                      deps='''ctdb-util samba-util talloc replace popt''',
                      install_path='${CTDB_HELPER_BINDIR}')
 
-    bld.SAMBA_SUBSYSTEM('ctdb-cluster-conf',
-                        source='cluster/cluster_conf.c',
-                        deps='ctdb-util')
-
-    bld.SAMBA_SUBSYSTEM('ctdb-database-conf',
-                        source='database/database_conf.c',
-                        deps='ctdb-util')
-
-    bld.SAMBA_SUBSYSTEM('ctdb-event-conf',
-                        source='event/event_conf.c',
-                        deps='ctdb-util')
-
-    bld.SAMBA_SUBSYSTEM('ctdb-failover-conf',
-                        source='failover/failover_conf.c',
-                        deps='ctdb-util')
-
-    bld.SAMBA_SUBSYSTEM('ctdb-legacy-conf',
-                        source='server/legacy_conf.c',
-                        deps='ctdb-util')
+    bld.SAMBA_SUBSYSTEM('ctdb-conf',
+                        source='''conf/logging_conf.c
+                                  conf/cluster_conf.c
+                                  conf/database_conf.c
+                                  conf/event_conf.c
+                                  conf/failover_conf.c
+                                  conf/legacy_conf.c
+                                  conf/ctdb_config.c
+                               ''',
+                        deps='''ctdb-util talloc replace''')
 
     bld.SAMBA_BINARY('ctdb-config',
-                     source='common/conf_tool.c',
+                     source='conf/conf_tool.c',
                      cflags='-DCTDB_CONF_TOOL',
-                     deps='''ctdb-logging-conf
-                             ctdb-event-conf
-                             ctdb-cluster-conf
-                             ctdb-database-conf
-                             ctdb-failover-conf
-                             ctdb-legacy-conf
+                     deps='''ctdb-conf
                              ctdb-util samba-util talloc replace popt''',
                      install_path='${CTDB_HELPER_BINDIR}')
 
@@ -587,7 +569,7 @@ def build(bld):
                                           event_request.c
                                           '''),
                      deps='''ctdb-event-protocol
-                             ctdb-event-conf ctdb-logging-conf
+                             ctdb-conf
                              ctdb-server-util samba-util ctdb-util
                              talloc tevent replace popt''',
                      install_path='${CTDB_HELPER_BINDIR}')
@@ -618,17 +600,11 @@ def build(bld):
                                              ctdb_update_record.c
                                              ctdb_lock.c ctdb_fork.c
                                              ctdb_tunnel.c ctdb_client.c
-                                             ctdb_config.c
                                           '''),
                      includes='include',
                      deps='''ctdb-common ctdb-system ctdb-protocol
                              ctdb-tcp ctdb-util replace sys_rw popt
-                             ctdb-logging-conf
-                             ctdb-cluster-conf
-                             ctdb-database-conf
-                             ctdb-event-conf
-                             ctdb-failover-conf
-                             ctdb-legacy-conf
+                             ctdb-conf
                              ctdb-event-protocol
                              talloc tevent tdb-wrap tdb talloc_report''' +
                           ib_deps,