diff --git a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run b/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run index d3945d2..da3a7b4 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run +++ b/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