Merge pull request #291 from linuxserver/crontab-perms

Format cron init and set permissions

README.md

@@ -254,6 +254,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **02.03.23:** - Set permissions on crontabs during init.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **10.10.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **30.09.22:** - Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html

readme-vars.yml

@@ -77,6 +77,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "02.03.23:", desc: "Set permissions on crontabs during init." }
   - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
   - { date: "10.10.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
   - { date: "30.09.22:", desc: "Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html" }

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run

@@ -1,23 +1,23 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-# create folders
+# make folders
 mkdir -p \
     /config/crontabs
 
-# if root crontabs do not exist in config
-# copy root crontab from system
-if [[ ! -f /config/crontabs/root ]] && crontab -l -u root; then
-    crontab -l -u root >/config/crontabs/root
-fi
-
-# if root crontabs still do not exist in config (were not copied from system)
-# copy root crontab from included defaults
+## root
+# if crontabs do not exist in config
 if [[ ! -f /config/crontabs/root ]]; then
-    cp /etc/crontabs/root /config/crontabs/
+    # copy crontab from system
+    if crontab -l -u root; then
+        crontab -l -u root >/config/crontabs/root
+    fi
+
+    # if crontabs still do not exist in config (were not copied from system)
+    # copy crontab from included defaults (using -n, do not overwrite an existing file)
+    cp -n /etc/crontabs/root /config/crontabs/
 fi
-
 sed -i "s|s6-setuidgid abc php[78] -f /config/www/nextcloud/cron.php|s6-setuidgid abc php -f /config/www/nextcloud/cron.php|" /config/crontabs/root
-
-# import user crontabs
+# set permissions and import user crontabs
+lsiown root:root /config/crontabs/root
 crontab -u root /config/crontabs/root