From 4a2ac950b5291037f54f3c62a4d482d1060b5d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos.alvaro@citelan.es>
Date: Fri, 9 Nov 2018 23:38:20 +0100
Subject: [PATCH] Expose logs directory

Now logs can be accessed through /home/salt/data/logs
---
 Dockerfile                  |  7 ++++---
 assets/runtime/functions.sh | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 662fa5d..314eca1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,8 @@ ENV SALT_BUILD_DIR="${SALT_DOCKER_DIR}/build" \
 
 ENV SALT_CONFS_DIR="${SALT_DATA_DIR}/config" \
     SALT_KEYS_DIR="${SALT_DATA_DIR}/keys" \
-    SALT_BASE_DIR="${SALT_DATA_DIR}/srv"
+    SALT_BASE_DIR="${SALT_DATA_DIR}/srv" \
+    SALT_LOGS_DIR="${SALT_DATA_DIR}/logs"
 
 # Set non interactive mode
 ENV DEBIAN_FRONTEND=noninteractive
@@ -48,8 +49,8 @@ RUN bash ${SALT_BUILD_DIR}/install.sh
 
 # Shared resources
 EXPOSE 4505/tcp 4506/tcp
-RUN mkdir -p ${SALT_DATA_DIR} ${SALT_BASE_DIR} ${SALT_KEYS_DIR} ${SALT_CONFS_DIR}
-VOLUME [ "${SALT_BASE_DIR}" "${SALT_KEYS_DIR}" "${SALT_CONFS_DIR}" ]
+RUN mkdir -p ${SALT_DATA_DIR} ${SALT_BASE_DIR} ${SALT_KEYS_DIR} ${SALT_CONFS_DIR} ${SALT_LOGS_DIR}
+VOLUME [ "${SALT_BASE_DIR}" "${SALT_KEYS_DIR}" "${SALT_CONFS_DIR}" "${SALT_LOGS_DIR}" ]
 
 COPY assets/runtime ${SALT_RUNTIME_DIR}
 RUN chmod -R +x ${SALT_RUNTIME_DIR}
diff --git a/assets/runtime/functions.sh b/assets/runtime/functions.sh
index 9671870..3c23c4c 100755
--- a/assets/runtime/functions.sh
+++ b/assets/runtime/functions.sh
@@ -97,14 +97,14 @@ function setup_ssh_keys()
 # This functions cofigures master service
 function configure_salt_master()
 {
-  echo "Configuring salt-master..."
+  echo "Configuring salt-master ..."
   # https://docs.saltstack.com/en/latest/ref/configuration/master.html
 
   # Backup file
   if [ ! -f ${SALT_ROOT_DIR}/master.backup ]; then
-    cp -p ${SALT_ROOT_DIR}/master ${SALT_ROOT_DIR}/master.backup
+    cp -p ${SALT_ROOT_DIR}/master ${SALT_ROOT_DIR}/master.orig
   else
-    cp -p ${SALT_ROOT_DIR}/master.backup ${SALT_ROOT_DIR}/master
+    cp -p ${SALT_ROOT_DIR}/master.orig ${SALT_ROOT_DIR}/master
   fi
 
   # Set env variables
@@ -113,6 +113,7 @@ function configure_salt_master()
       -e "s|^[#]*log_level_logfile:.*$|log_level_logfile: ${SALT_LEVEL_LOGFILE}|" \
       -e "s|^[#]*default_include:.*$|default_include: ${SALT_CONFS_DIR}/*.conf|" \
       -e "s|^[#]*pki_dir:.*$|pki_dir: ${SALT_KEYS_DIR}/|" \
+      -e "s|/var/log/salt|${SALT_LOGS_DIR}|g" \
       ${SALT_ROOT_DIR}/master
 
   cat >> ${SALT_ROOT_DIR}/master <<EOF
@@ -136,11 +137,17 @@ EOF
 # Initializes main directories
 function initialize_datadir()
 {
-  echo "Configuring directories..."
+  echo "Configuring directories ..."
   
   # This symlink simplifies paths for loading sls files
-  rm -rf /srv
-  ln -sf ${SALT_BASE_DIR} /srv
+  [[ -d /srv ]] && [[ ! -L /srv ]] && rm -rf /srv
+  ln -sfnv ${SALT_BASE_DIR} /srv
+
+  # Logs directory
+  [[ -d /var/log/salt ]] && [[ ! -L /var/log/salt ]] && rm -rf /var/log/salt
+  mkdir -p /var/log
+  ln -sfnv ${SALT_LOGS_DIR} /var/log/salt
+  chown -R ${SALT_USER} ${SALT_LOGS_DIR}
 }
 
 # Initializes the system