From 1f42ec3bd5b991f03803792f11ba9ac11484488c Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 2 Mar 2023 09:58:07 -0600
Subject: [PATCH 1/3] set permissions on crontabs

---
 root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run | 6 ++++++
 1 file changed, 6 insertions(+)

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 aec275c..8070ce0 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
@@ -25,6 +25,12 @@ if [[ ! -f /config/crontabs/abc ]]; then
     cp /etc/crontabs/abc /config/crontabs/
 fi
 
+# set permissions on crontabs
+lsiown root:root \
+    /config/crontabs/root
+lsiown abc:abc \
+    /config/crontabs/abc
+
 # import user crontabs
 crontab -u root /config/crontabs/root
 crontab -u abc /config/crontabs/abc

From dd96c542796fd212764469166233638197d23cea Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 2 Mar 2023 13:21:27 -0600
Subject: [PATCH 2/3] Format cron init and set permissions

---
 .../s6-rc.d/init-crontabs-config/run          | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

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 8070ce0..8859365 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,36 +1,38 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-# 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
+# make folders
+mkdir -p \
+    /config/crontabs
 
-# 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
-
-# if abc crontabs do not exist in config
-# copy abc crontab from system
-if [[ ! -f /config/crontabs/abc ]] && crontab -l -u abc; then
-    crontab -l -u abc >/config/crontabs/abc
-fi
-
-# if abc crontabs still do not exist in config (were not copied from system)
-# copy abc crontab from included defaults
-if [[ ! -f /config/crontabs/abc ]]; then
-    cp /etc/crontabs/abc /config/crontabs/
-fi
-
-# set permissions on crontabs
-lsiown root:root \
-    /config/crontabs/root
-lsiown abc:abc \
-    /config/crontabs/abc
-
-# import user crontabs
+# set permissions and import user crontabs
+lsiown root:root /config/crontabs/root
 crontab -u root /config/crontabs/root
+
+## abc
+# if crontabs do not exist in config
+if [[ ! -f /config/crontabs/abc ]]; then
+    # copy crontab from system
+    if crontab -l -u abc; then
+        crontab -l -u abc >/config/crontabs/abc
+    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/abc /config/crontabs/
+fi
+# set permissions and import user crontabs
+lsiown abc:abc /config/crontabs/abc
 crontab -u abc /config/crontabs/abc

From 28df27df1fa49f9845d913f8d6097ca9f1d465d9 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 2 Mar 2023 19:33:10 +0000
Subject: [PATCH 3/3] Update readme

---
 README.md       | 1 +
 readme-vars.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index b01f011..e691258 100644
--- a/README.md
+++ b/README.md
@@ -336,6 +336,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **02.03.23:** - Set permissions on crontabs during init.
 * **09.02.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs.
 * **06.02.23:** - Add porkbun support back in.
 * **21.01.23:** - Unpin certbot version (allow certbot 2.x). !!BREAKING CHANGE!! We are temporarily removing the certbot porkbun plugin until a new version is released that is compatible with certbot 2.x.
diff --git a/readme-vars.yml b/readme-vars.yml
index 5c4f7f5..9aa2f82 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -154,6 +154,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "02.03.23:", desc: "Set permissions on crontabs during init." }
   - { date: "09.02.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf, authelia-location.conf and authelia-server.conf - Add Authentik configs, update Authelia configs." }
   - { date: "06.02.23:", desc: "Add porkbun support back in." }
   - { date: "21.01.23:", desc: "Unpin certbot version (allow certbot 2.x). !!BREAKING CHANGE!! We are temporarily removing the certbot porkbun plugin until a new version is released that is compatible with certbot 2.x." }