Update docker files from latest Rafael's changes

4 files changed, 58 insertions, 11 deletions

diff --git a/docker/scripts/lib/base_config.sh b/docker/scripts/lib/base_config.sh
new file mode 100644
index 000000000..a856fe785
--- /dev/null
+++ b/docker/scripts/lib/base_config.sh
@@ -0,0 +1,53 @@
+readonly HOSTIP=$(hostname -i)
+readonly HOSTNAME=$(hostname -f)
+readonly DOMAINNAME=$(hostname -d)
+
+readonly ERLANGCOOKIEFILE="${EJABBERD_HOME}/.erlang.cookie"
+readonly EJABBERDCTL="/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="/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/lib/base_functions.sh b/docker/scripts/lib/base_functions.sh
index d7bf97266..daadd1f68 100644
--- a/docker/lib/base_functions.sh
+++ b/docker/scripts/lib/base_functions.sh
@@ -29,16 +29,10 @@ is_true() {
 }
 
 
-log() {
-    local message=$1
-    echo $message
-}
-
-
 # overwrite this function to get hostname from other sources
 # like dns or etcd
 get_nodename() {
-    log ${HOSTNAME}
+    echo ${HOSTNAME}
 }
 
 
@@ -48,25 +42,25 @@ join_cluster() {
     is_zero ${cluster_node} \
         && exit 0
 
-    log "Join cluster..."
+    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
-        log "Waiting for ${erlang_cluster_node}..."
+        echo "Waiting for ${erlang_cluster_node}..."
         sleep 2
         response=$(${EJABBERDCTL} ping ${erlang_cluster_node})
     done
 
-    log "Join cluster at ${erlang_cluster_node}... "
+    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
-        log "cloud not join cluster"
+        echo "cloud not join cluster"
         exit 1
     fi
 }
diff --git a/docker/lib/config.sh b/docker/scripts/lib/config.sh
index 6b9cbbb12..6b9cbbb12 100644
--- a/docker/lib/config.sh
+++ b/docker/scripts/lib/config.sh
diff --git a/docker/lib/functions.sh b/docker/scripts/lib/functions.sh
index 6b9cbbb12..6b9cbbb12 100644
--- a/docker/lib/functions.sh
+++ b/docker/scripts/lib/functions.sh