Merge pull request #278 from IdentityPython/refactor-docker-start

Refactor docker start script

- Cleanup code and formatting
- Allow to specify a configuration file for gunicorn
- Allow to specify a chain link for the https certificate

Author: c00kiemon5ter

docker/start.sh

@@ -1,46 +1,65 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+set -e
 
 # for Click library to work in satosa-saml-metadata
-export LC_ALL=C.UTF-8
-export LANG=C.UTF-8
+export LC_ALL="C.UTF-8"
+export LANG="C.UTF-8"
 
-# exit immediately on failure
-set -e
+if [ -z "${DATA_DIR}" ]
+then DATA_DIR=/opt/satosa/etc
+fi
 
-if [ -z "${DATA_DIR}" ]; then
-   DATA_DIR=/opt/satosa/etc
+if [ ! -d "${DATA_DIR}" ]
+then mkdir -p "${DATA_DIR}"
 fi
 
-if [ ! -d "${DATA_DIR}" ]; then
-   mkdir -p "${DATA_DIR}"
+if [ -z "${PROXY_PORT}" ]
+then PROXY_PORT="8000"
 fi
 
-if [ -z "${PROXY_PORT}" ]; then
-   PROXY_PORT="8000"
+if [ -z "${METADATA_DIR}" ]
+then METADATA_DIR="${DATA_DIR}"
 fi
 
-if [ -z "${METADATA_DIR}" ]; then
-   METADATA_DIR="${DATA_DIR}"
+if [ ! -d "${DATA_DIR}/attributemaps" ]
+then cp -pr /opt/satosa/attributemaps "${DATA_DIR}/attributemaps"
 fi
 
-cd ${DATA_DIR}
+# activate virtualenv
+. /opt/satosa/bin/activate
 
-mkdir -p ${METADATA_DIR}
+# generate metadata for frontend(IdP interface) and backend(SP interface)
+# write the result to mounted volume
+mkdir -p "${METADATA_DIR}"
+satosa-saml-metadata              \
+	"${DATA_DIR}/proxy_conf.yaml" \
+	"${DATA_DIR}/metadata.key"    \
+	"${DATA_DIR}/metadata.crt"    \
+	--dir "${METADATA_DIR}"
 
-if [ ! -d ${DATA_DIR}/attributemaps ]; then
-   cp -pr /opt/satosa/attributemaps ${DATA_DIR}/attributemaps
+# if the user provided a gunicorn configuration, use it
+if [ -f "$GUNICORN_CONF" ]
+then conf_opt="--config ${GUNICORN_CONF}"
 fi
 
-# Activate virtualenv
-. /opt/satosa/bin/activate
-
-# generate metadata for front- (IdP) and back-end (SP) and write it to mounted volume
+# if HTTPS cert is available, use it
+https_key="${DATA_DIR}/https.key"
+https_crt="${DATA_DIR}/https.crt"
+if [ -f "$https_key" -a -f "$https_crt" ]
+then https_opts="--keyfile ${https_key} --certfile ${https_crt}"
+fi
 
-satosa-saml-metadata proxy_conf.yaml ${DATA_DIR}/metadata.key ${DATA_DIR}/metadata.crt --dir ${METADATA_DIR}
+# if a chain is available, use it
+chain_pem="${DATA_DIR}/chain.pem"
+if [ -f "$chain_pem" ]
+then chain_opts="--ca-certs chain.pem"
+fi
 
 # start the proxy
-if [[ -f https.key && -f https.crt ]]; then # if HTTPS cert is available, use it
-  exec gunicorn -b0.0.0.0:${PROXY_PORT} --keyfile https.key --certfile https.crt satosa.wsgi:app
-else
-  exec gunicorn -b0.0.0.0:${PROXY_PORT} satosa.wsgi:app
-fi
+exec gunicorn $conf_opt        \
+	-b 0.0.0.0:"${PROXY_PORT}" \
+	satosa.wsgi:app            \
+	$https_opts                \
+	$chain_opts                \
+	;