more tuning to startup scripts

[citadel-docker.git] / citadel-docker-startup.sh

diff --git a/citadel-docker-startup.sh b/citadel-docker-startup.sh
index 9382ea1261c6e744f7ac4d7aad551bf1c39516f0..b9558e6e8f391048fc0da20eee4301ff606b004e 100755 (executable)
--- a/citadel-docker-startup.sh
+++ b/citadel-docker-startup.sh
@@ -2,10 +2,17 @@
 
 # This is the script that is run when the Citadel Docker Container starts up.
 
-mkdir /citadel-data
-mkdir -p /citadel-data/data && rm -vfr /usr/local/citadel/data && ln -sfv /citadel-data/data /usr/local/citadel/data
-mkdir -p /citadel-data/files && rm -vfr  /usr/local/citadel/files && ln -sfv /citadel-data/files /usr/local/citadel/files
-mkdir -p /citadel-data/keys && rm -vfr /usr/local/citadel/keys && ln -sfv /citadel-data/keys /usr/local/citadel/keys
-rmdir -v /usr/local/webcit/keys && ln -sfv /citadel-data/keys /usr/local/webcit/keys
+# Create directories within the volume, if they do not already exist.
+mkdir -p /citadel-data         2>/dev/null
+mkdir -p /citadel-data/data    2>/dev/null
+mkdir -p /citadel-data/files   2>/dev/null
+mkdir -p /citadel-data/keys    2>/dev/null
 
-exec supervisor
+# Create symlinks into the volume subdirectories, from where our programs expect them to be.
+ln -sfv /citadel-data/data /usr/local/citadel/
+ln -sfv /citadel-data/files /usr/local/citadel/
+ln -sfv /citadel-data/keys /usr/local/citadel/
+ln -sfv /citadel-data/keys /usr/local/webcit/
+
+# supervisord will take it from here.
+exec /usr/bin/supervisord -c /etc/supervisor.conf