X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=entrypoint.sh;h=f1a8c229a38159d660f157d4ac089c2c7575cbd7;hb=2da071d0ea2fd29ddb7515f6bf702947398e1dbd;hp=7623322067fdf874375a9bee0cb77d7eb229a44f;hpb=638dee77047993a56953285a5a85685a0e101c79;p=github%2Fbastienwirtz%2Fhomer.git

diff --git a/entrypoint.sh b/entrypoint.sh
index 7623322..f1a8c22 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,6 +1,15 @@
 #!/bin/sh
 
-yes n | cp -i /www/config.yml.dist /www/config.yml
-while true; do echo n; done | cp -Ri /app/dist/www/assets /www/assets 2>/dev/null
+# Ensure default assets are present.
+while true; do echo n; done | cp -Ri /www/default-assets/* /www/assets/ &> /dev/null
 
-darkhttpd /www/ --no-listing --port $PORT
+# Ensure compatibility with previous version (config.yml was in the root directory)
+if [ -f "/www/config.yml" ]; then
+    yes n | cp -i /www/config.yml /www/assets/ &> /dev/null
+fi
+
+# Install default config if no one is available.
+yes n | cp -i /www/default-assets/config.yml.dist /www/assets/config.yml &> /dev/null
+
+chown -R $UID:$GID /www/assets
+exec su-exec $UID:$GID darkhttpd /www/ --no-listing --port "$PORT"