Merge pull request #112 from linuxserver/fix-permissions

Reorder init to fix permissions

root/etc/cont-init.d/50-config

@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make our folders
 mkdir -p \
-    /config/www/{backgrounds,icons,avatars,SupportedApps} \
+    /config/www/{avatars,backgrounds,icons,logs,SupportedApps} \
     /app/www \
     /config/log/heimdall
 
@@ -14,53 +15,48 @@ if [[ -f /heimdall/heimdall.tar.gz ]]; then
         /app/www --strip-components=1
     echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
         /etc/nginx/fastcgi_params
-    rm -rf /heimdall
     cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig
-    chown -R abc:abc /app/www
 fi
+
 # create symlinks
-
-symlinks=( \
-/app/www/storage/app/public/avatars \
-/app/www/storage/app/public/backgrounds \
-/app/www/storage/app/public/icons \
-/app/www/app/SupportedApps \
-/app/www/database/app.sqlite \
-/app/www/.env )
-
-for i in "${symlinks[@]}"
-do
-    if [[ -e "$i" && ! -L "$i" ]]; then
-        rm -rf "$i"
+symlinks=(
+    /app/www/storage/app/public/avatars
+    /app/www/storage/app/public/backgrounds
+    /app/www/storage/app/public/icons
+    /app/www/storage/logs
+    /app/www/app/SupportedApps
+    /app/www/database/app.sqlite
+    /app/www/.env
+)
+for i in "${symlinks[@]}"; do
+    if [[ -e "${i}" && ! -L "${i}" ]]; then
+        rm -rf "${i}"
     fi
-    if [[ ! -L "$i" ]]; then
-        ln -s /config/www/"$(basename "$i")" "$i"
+    if [[ ! -L "${i}" ]]; then
+        ln -s /config/www/"$(basename "${i}")" "${i}"
     fi
 done
 
-if [[ -e "/app/www/storage/logs/laravel.log" && ! -L "/app/www/storage/logs/laravel.log" ]]; then
-    rm -rf "/app/www/storage/logs/laravel.log"
-fi
-if [[ ! -L "/app/www/storage/logs/laravel.log" ]]; then
-    ln -s "/config/log/heimdall/laravel.log" "/app/www/storage/logs/laravel.log"
-fi
-
-# copy .env if not exists
-if [[ ! -f /config/www/.env ]]; then
-    cp /app/www/.env.example /config/www/.env
-    echo "Creating app key. This may take a while on slower systems"
-    php /app/www/artisan key:generate
-fi
 # copy searchproviders if not exists and symlink
 if [[ ! -f /config/www/searchproviders.yaml ]]; then
     cp /app/www/storage/app/searchproviders.yaml.orig /config/www/searchproviders.yaml
 fi
 rm -rf /app/www/storage/app/searchproviders.yaml
 ln -s /config/www/searchproviders.yaml /app/www/storage/app/searchproviders.yaml
+
+# tidy up install files & set permissions
+if [[ -f /heimdall/heimdall.tar.gz ]]; then
+    rm -rf /heimdall
+    chown -R abc:abc /app/www
+    chown -R abc:abc /config
+fi
+
+# copy .env if not exists
+if [[ ! -f /config/www/.env ]]; then
+    install -g abc -o abc /app/www/.env.example /config/www/.env
+    echo "Creating app key. This may take a while on slower systems"
+    s6-setuidgid abc php /app/www/artisan key:generate
+fi
+
 # set queue driver to database
 sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env
-
-# permissions
-echo "Setting permissions"
-chown -R abc:abc \
-    /config

root/etc/logrotate.d/heimdall

@@ -1,9 +0,0 @@
-/config/log/heimdall/laravel.log {
-        size 5M
-        rotate 5
-        compress
-        nodateext
-        notifempty
-        missingok
-        su abc abc
-}