From d6e1bc242c11b74f1aedde1398322253a753225d Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Thu, 11 Jan 2018 10:19:56 +0100 Subject: Remove old docker specs --- docker/scripts/lib/base_config.sh | 53 ----------------------------- docker/scripts/lib/base_functions.sh | 66 ------------------------------------ docker/scripts/lib/config.sh | 1 - docker/scripts/lib/functions.sh | 1 - 4 files changed, 121 deletions(-) delete mode 100644 docker/scripts/lib/base_config.sh delete mode 100644 docker/scripts/lib/base_functions.sh delete mode 100644 docker/scripts/lib/config.sh delete mode 100644 docker/scripts/lib/functions.sh (limited to 'docker/scripts/lib') diff --git a/docker/scripts/lib/base_config.sh b/docker/scripts/lib/base_config.sh deleted file mode 100644 index 9f66a4ae5..000000000 --- a/docker/scripts/lib/base_config.sh +++ /dev/null @@ -1,53 +0,0 @@ -readonly HOSTIP=$(hostname -i) -readonly HOSTNAME=$(hostname -f) -readonly DOMAINNAME=$(hostname -d) - -readonly ERLANGCOOKIEFILE="${EJABBERD_HOME}/.erlang.cookie" -readonly EJABBERDCTL="/usr/local/sbin/ejabberdctl" -readonly CONFIGFILE="${EJABBERD_HOME}/conf/ejabberd.yml" -readonly CONFIGTEMPLATE="${EJABBERD_HOME}/conf/ejabberd.yml.tpl" -readonly CTLCONFIGFILE="${EJABBERD_HOME}/conf/ejabberdctl.cfg" -readonly CTLCONFIGTEMPLATE="${EJABBERD_HOME}/conf/ejabberdctl.cfg.tpl" -readonly SSLCERTDIR="${EJABBERD_HOME}/ssl" -readonly SSLCERTHOST="${SSLCERTDIR}/host.pem" -readonly SSLDHPARAM="${SSLCERTDIR}/dh.pem" -readonly LOGDIR="/usr/local/var/log/ejabberd" -readonly FIRST_START_DONE_FILE="/${EJABBERD_HOME}/first-start-done" -readonly CLUSTER_NODE_FILE="/${EJABBERD_HOME}/cluster-done" - -readonly PYTHON_JINJA2="import os; -import sys; -import jinja2; -sys.stdout.write( - jinja2.Template - (sys.stdin.read() - ).render(env=os.environ))" - -# backward compatibility environment variables -set +e - -[[ -n $EJABBERD_ADMIN ]] \ - && export EJABBERD_ADMINS=${EJABBERD_ADMIN} - -[[ -n $AUTH_METHOD ]] \ - && export EJABBERD_AUTH_METHOD=${AUTH_METHOD} - -[[ -n $SKIP_MODULES_UPDATE ]] \ - && export EJABBERD_SKIP_MODULES_UPDATE=${SKIP_MODULES_UPDATE} - -[[ -n $ERL_OPTIONS ]] \ - && export ERLANG_OPTIONS=${ERL_OPTIONS} - -[[ -n $SSLCERT_HOST ]] \ - && export EJABBERD_SSLCERT_HOST=${SSLCERT_HOST} - -[[ -n $SSLCERT_EXAMPLE_COM ]] \ - && export EJABBERD_SSLCERT_EXAMPLE_COM=${SSLCERT_EXAMPLE_COM} - -[[ -n $LOGLEVEL ]] \ - && export EJABBERD_LOGLEVEL=${LOGLEVEL} - -[[ -n $EJABBERD_WEB_ADMIN_SSL ]] \ - && export EJABBERD_HTTPS=${EJABBERD_WEB_ADMIN_SSL} - -set -e diff --git a/docker/scripts/lib/base_functions.sh b/docker/scripts/lib/base_functions.sh deleted file mode 100644 index daadd1f68..000000000 --- a/docker/scripts/lib/base_functions.sh +++ /dev/null @@ -1,66 +0,0 @@ -is_set() { - local var=$1 - - [[ -n $var ]] -} - - -is_zero() { - local var=$1 - - [[ -z $var ]] -} - - -file_exist() { - local file=$1 - - [[ -e $file ]] -} - - -is_true() { - local var=${1,,} - local choices=("yes" "1" "y" "true") - for ((i=0;i < ${#choices[@]};i++)) { - [[ "${choices[i]}" == $var ]] && return 0 - } - return 1 -} - - -# overwrite this function to get hostname from other sources -# like dns or etcd -get_nodename() { - echo ${HOSTNAME} -} - - -join_cluster() { - local cluster_node=$1 - - is_zero ${cluster_node} \ - && exit 0 - - echo "Join cluster..." - - local erlang_node_name=${ERLANG_NODE%@*} - local erlang_cluster_node="${erlang_node_name}@${cluster_node}" - - response=$(${EJABBERDCTL} ping ${erlang_cluster_node}) - while [ "$response" != "pong" ]; do - echo "Waiting for ${erlang_cluster_node}..." - sleep 2 - response=$(${EJABBERDCTL} ping ${erlang_cluster_node}) - done - - echo "Join cluster at ${erlang_cluster_node}... " - NO_WARNINGS=true ${EJABBERDCTL} join_cluster $erlang_cluster_node - - if [ $? -eq 0 ]; then - touch ${CLUSTER_NODE_FILE} - else - echo "cloud not join cluster" - exit 1 - fi -} diff --git a/docker/scripts/lib/config.sh b/docker/scripts/lib/config.sh deleted file mode 100644 index 6b9cbbb12..000000000 --- a/docker/scripts/lib/config.sh +++ /dev/null @@ -1 +0,0 @@ -# Overridable file diff --git a/docker/scripts/lib/functions.sh b/docker/scripts/lib/functions.sh deleted file mode 100644 index 6b9cbbb12..000000000 --- a/docker/scripts/lib/functions.sh +++ /dev/null @@ -1 +0,0 @@ -# Overridable file -- cgit v1.2.3