diff --git a/galera.spec b/galera.spec index 06bb340..17f5755 100644 --- a/galera.spec +++ b/galera.spec @@ -15,9 +15,6 @@ URL: http://galeracluster.com/ Source0: http://releases.galeracluster.com/source/%{name}-%{version}.tar.gz -Source1: garbd.service -Source2: garbd-wrapper - Patch0: cmake_paths.patch BuildRequires: boost-devel check-devel openssl-devel cmake systemd gcc-c++ asio-devel @@ -135,7 +132,6 @@ sed -i 's/User=nobody/User=garb/g' %{buildroot}/usr/lib/systemd/system/garbd.ser %dir %{_libdir}/galera %{_sbindir}/garbd -#%{_sbindir}/garbd-wrapper # PATCH 3: # Make sure the wrapper script is executable diff --git a/garbd-wrapper b/garbd-wrapper deleted file mode 100755 index ede76f7..0000000 --- a/garbd-wrapper +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/sh -# This script is simple wrapper around garbd, that parses startup configuration. -# Its main purpose is to bridge the differences between initscript and systemd unit file. - -CONFIG_FILE=/etc/sysconfig/garb - -source $CONFIG_FILE - -# Check that node addresses and group name are configured -if [ -z "$GALERA_NODES" ]; then - echo "List of GALERA_NODES is not configured" >&2 - exit 1 -fi -if [ -z "$GALERA_GROUP" ]; then - echo "GALERA_GROUP name is not configured" >&2 - exit 1 -fi - -GALERA_PORT=${GALERA_PORT:-4567} - -# Find a working node -for ADDRESS in ${GALERA_NODES} 0; do - HOST=$(echo $ADDRESS | cut -d \: -f 1) - PORT=$(echo $ADDRESS | cut -s -d \: -f 2) - PORT=${PORT:-$GALERA_PORT} - ncat --send-only --recv-only $HOST $PORT >/dev/null && break -done -if [ ${ADDRESS} == "0" ]; then - echo "None of the nodes in GALERA_NODES is accessible" >&2 - exit 1 -fi - -OPTIONS="-a gcomm://$ADDRESS" -[ -n "$GALERA_GROUP" ] && OPTIONS="$OPTIONS -g $GALERA_GROUP" -[ -n "$GALERA_OPTIONS" ] && OPTIONS="$OPTIONS -o $GALERA_OPTIONS" -[ -n "$LOG_FILE" ] && OPTIONS="$OPTIONS -l $LOG_FILE" - -exec /usr/sbin/garbd $OPTIONS diff --git a/garbd.service b/garbd.service deleted file mode 100644 index 9645fe2..0000000 --- a/garbd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Galera Arbitrator Daemon -Documentation=http://www.codership.com/wiki/doku.php?id=galera_arbitrator - -[Service] -ExecStart=/usr/sbin/garbd-wrapper -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target