From e596be069a685178ebd8ae2e791c01dac9620b73 Mon Sep 17 00:00:00 2001 From: Roman Vanicek Date: Tue, 24 Feb 2026 22:05:04 +0000 Subject: [PATCH] CTDB use ctdb.conf instead of obsolete ctdbd.conf --- entrypoint.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 040e8d6..703aa96 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -37,21 +37,23 @@ else exit 1 fi echo "Starting as a cluster" - rm -f /etc/ctdb/ctdbd.conf - # For CTDB variables see https://manpages.debian.org/unstable/ctdb/ctdbd.conf.5.en.html + rm -f /etc/ctdb/ctdb.conf + # For CTDB variables see https://ctdb.samba.org/manpages/ctdb.conf.5.html export CTDB_ENABLED=true - echo 'CTDB_NODES=!/resolveNodes.sh '"$CLUSTER_NODE_NAMES" >> /etc/ctdb/ctdbd.conf + echo [cluster] >> /etc/ctdb/ctdb.conf + echo 'nodes list = !/resolveNodes.sh '"$CLUSTER_NODE_NAMES" >> /etc/ctdb/ctdb.conf mkdir -p "$CLUSTER_SYSDIR_SHARED/ctdb" mkdir -p "$CLUSTER_SYSDIR_SHARED/etc" mkdir -p "$CLUSTER_SYSDIR_SHARED/cups" ln -s "$CLUSTER_SYSDIR_SHARED/cups" /etc/cups-persist mkdir -p "$CLUSTER_SYSDIR_SHARED/printerdrivers" - echo CTDB_RECOVERY_LOCK=$CLUSTER_SYSDIR_SHARED/ctdb/ctdb.lock >> /etc/ctdb/ctdbd.conf + echo cluster lock = $CLUSTER_SYSDIR_SHARED/ctdb/ctdb.lock >> /etc/ctdb/ctdb.conf ETC_DIR=$CLUSTER_SYSDIR_SHARED/etc PRINTERDRIVERS_DIR=$CLUSTER_SYSDIR_SHARED/printerdrivers mkdir -p "$CLUSTER_SYSDIR_LOCAL/ctdb" - echo CTDB_DBDIR_PERSISTENT=$CLUSTER_SYSDIR_LOCAL/ctdb >> /etc/ctdb/ctdbd.conf + echo [database] >> /etc/ctdb/ctdb.conf + echo persistent database directory = $CLUSTER_SYSDIR_LOCAL/ctdb >> /etc/ctdb/ctdb.conf NETBIOS_NAME=$CLUSTER_NAME fi