Merge pull request #112 from linuxserver/fix-permissions

Reorder init to fix permissions

package_versions.txt

@@ -1,83 +1,83 @@
-alpine-baselayout-3.2.0-r16
-alpine-keys-2.4-r0
+alpine-baselayout-3.2.0-r18
+alpine-keys-2.4-r1
 apache2-utils-2.4.54-r0
-apk-tools-2.12.7-r0
+apk-tools-2.12.7-r3
 apr-1.7.0-r1
-apr-util-1.6.1-r7
+apr-util-1.6.1-r11
 argon2-libs-20190702-r1
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r8
+busybox-1.34.1-r7
 ca-certificates-20220614-r0
 ca-certificates-bundle-20220614-r0
-coreutils-8.32-r2
-curl-7.79.1-r3
+coreutils-9.0-r2
+curl-7.80.0-r4
 expat-2.5.0-r0
-gdbm-1.19-r0
-git-2.32.4-r0
+git-2.34.5-r0
+icu-libs-69.1-r1
 libacl-2.2.53-r0
-libattr-2.5.1-r0
+libattr-2.5.1-r1
+libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1s-r0
-libcurl-7.79.1-r3
-libedit-20210216.3.1-r0
+libcrypto1.1-1.1.1s-r1
+libcurl-7.80.0-r4
+libedit-20210910.3.1-r0
+libgcc-10.3.1_git20211027-r0
 libintl-0.21-r0
-libldap-2.4.58-r0
-libmagic-5.40-r1
-libpq-13.8-r0
+libpq-14.5-r0
 libproc-3.3.17-r0
-libressl3.3-libcrypto-3.3.6-r0
-libressl3.3-libssl-3.3.6-r0
-libretls-3.3.3p1-r3
-libsasl-2.1.28-r0
-libssl1.1-1.1.1s-r0
+libretls-3.3.4-r3
+libssl1.1-1.1.1s-r1
+libstdc++-10.3.1_git20211027-r0
 libuuid-2.37.4-r0
 libxml2-2.9.14-r2
-libzip-1.7.3-r2
-linux-pam-1.5.1-r1
+libzip-1.8.0-r1
+linux-pam-1.5.2-r0
 logrotate-3.18.1-r4
-musl-1.2.2-r3
-musl-utils-1.2.2-r3
-nano-5.7-r2
-ncurses-libs-6.2_p20210612-r1
-ncurses-terminfo-base-6.2_p20210612-r1
-nghttp2-libs-1.43.0-r0
+musl-1.2.2-r7
+musl-utils-1.2.2-r7
+nano-5.9-r0
+ncurses-libs-6.3_p20211120-r1
+ncurses-terminfo-base-6.3_p20211120-r1
+nghttp2-libs-1.46.0-r0
 nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
-openssl-1.1.1s-r0
-pcre-8.44-r0
-pcre2-10.36-r1
-php7-7.4.33-r0
-php7-common-7.4.33-r0
-php7-ctype-7.4.33-r0
-php7-curl-7.4.33-r0
-php7-fileinfo-7.4.33-r0
-php7-fpm-7.4.33-r0
-php7-json-7.4.33-r0
-php7-mbstring-7.4.33-r0
-php7-mysqlnd-7.4.33-r0
-php7-openssl-7.4.33-r0
-php7-pdo-7.4.33-r0
-php7-pdo_mysql-7.4.33-r0
-php7-pdo_pgsql-7.4.33-r0
-php7-pdo_sqlite-7.4.33-r0
-php7-session-7.4.33-r0
-php7-simplexml-7.4.33-r0
-php7-tokenizer-7.4.33-r0
-php7-xml-7.4.33-r0
-php7-xmlwriter-7.4.33-r0
-php7-zip-7.4.33-r0
+openssl-1.1.1s-r1
+pcre-8.45-r1
+pcre2-10.40-r0
+php8-8.0.25-r0
+php8-common-8.0.25-r0
+php8-ctype-8.0.25-r0
+php8-curl-8.0.25-r0
+php8-fileinfo-8.0.25-r0
+php8-fpm-8.0.25-r0
+php8-intl-8.0.25-r0
+php8-mbstring-8.0.25-r0
+php8-mysqlnd-8.0.25-r0
+php8-openssl-8.0.25-r0
+php8-pdo-8.0.25-r0
+php8-pdo_mysql-8.0.25-r0
+php8-pdo_pgsql-8.0.25-r0
+php8-pdo_sqlite-8.0.25-r0
+php8-session-8.0.25-r0
+php8-simplexml-8.0.25-r0
+php8-tokenizer-8.0.25-r0
+php8-xml-8.0.25-r0
+php8-xmlwriter-8.0.25-r0
+php8-zip-8.0.25-r0
 popt-1.18-r0
 procps-3.3.17-r0
-readline-8.1.0-r0
-s6-ipcserver-2.10.0.3-r0
-scanelf-1.3.2-r0
-shadow-4.8.1-r0
-skalibs-2.10.0.3-r0
-sqlite-libs-3.35.5-r0
-ssl_client-1.33.1-r8
+readline-8.1.1-r0
+s6-ipcserver-2.11.0.0-r0
+scanelf-1.3.3-r0
+shadow-4.8.1-r1
+skalibs-2.11.0.0-r0
+sqlite-libs-3.36.0-r0
+ssl_client-1.34.1-r7
+tar-1.34-r0
 tzdata-2022f-r1
-utmps-0.1.0.2-r0
+utmps-0.1.0.3-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
 zlib-1.2.12-r3
+zstd-libs-1.5.0-r0

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
-}