diff --git a/docker-compose.yml b/docker-compose.yml index 0500dbe..d9d6497 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,4 +22,4 @@ web: - APP_DB_NAME=openxpki - APP_DB_USER=openxpki - APP_DB_PASS=openxpki - - APP_DB_ROOT_PASS=my-super-secret-password \ No newline at end of file + - APP_DB_ROOT_PASS=my-super-secret-password diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index c33e40e..b25e9a4 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -64,10 +64,16 @@ function create_config { echo "Found custom configuration, securing and executing it." chown root:root /etc/openxpki/customconfig.sh chmod 700 /etc/openxpki/customconfig.sh - /etc/openxpki/customconfig.sh + sh /etc/openxpki/customconfig.sh + elif [ -f "/usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh.gz" ]; then + echo "Found no custom customconfig.sh - using default compressed sampleconfig.sh.gz from /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh" + gunzip /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh.gz + chown root:root /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh + chmod 700 /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh + sh /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh elif [ -f "/usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh" ]; then echo "Found no custom customconfig.sh - using default sampleconfig.sh from /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh" - /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh + sh /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh else echo "Found no sampleconfig.sh and no customconfig.sh" exit 1