1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

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>
This commit is contained in:
Martin Schwenke 2019-08-19 12:06:40 +10:00 committed by Anoop C S
parent a77cffaa25
commit 52e5e92693
22 changed files with 44 additions and 66 deletions

View File

@ -24,7 +24,7 @@
#include "common/conf.h"
#include "cluster_conf.h"
#include "conf/cluster_conf.h"
#define CLUSTER_TRANSPORT_DEFAULT "tcp"

View File

@ -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 "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 "common/conf_tool.h"
#include "conf/conf_tool.h"
struct conf_tool_context {
struct cmdline_context *cmdline;

View File

@ -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;

View File

@ -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"

View File

@ -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,

View File

@ -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,

View File

@ -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"

View File

@ -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"

View File

@ -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;

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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;

View File

@ -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,