Compare commits

...

7 Commits

Author SHA1 Message Date
LinuxServer-CI
8ca0f24782 Bot Updating Package Versions 2023-03-08 23:19:11 -06:00
LinuxServer-CI
b7fba5e404 Bot Updating Package Versions 2023-03-07 16:57:40 -06:00
LinuxServer-CI
605b7b8ad7 Bot Updating Package Versions 2023-03-03 01:11:00 +01:00
Eric Nemchik
3a70f75402 Merge pull request #346 from linuxserver/crontab-perms
Format cron init and set permissions
2023-03-02 18:02:24 -06:00
Eric Nemchik
28df27df1f Update readme 2023-03-02 19:33:10 +00:00
Eric Nemchik
dd96c54279 Format cron init and set permissions 2023-03-02 13:21:27 -06:00
Eric Nemchik
1f42ec3bd5 set permissions on crontabs 2023-03-02 09:58:07 -06:00
4 changed files with 56 additions and 48 deletions

View File

@@ -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.

View File

@@ -2,7 +2,7 @@ NAME VERSION TYPE
ConfigArgParse 1.5.3 python
PyJWT 2.6.0 python
PyYAML 6.0 python
acme 2.3.0 python
acme 2.4.0 python
alpine-baselayout 3.4.0-r0 apk
alpine-baselayout-data 3.4.0-r0 apk
alpine-keys 2.4-r1 apk
@@ -21,8 +21,8 @@ azure-mgmt-core 1.3.2 python
azure-mgmt-dns 8.0.0 python
bash 5.2.15-r0 apk
beautifulsoup4 4.11.2 python
boto3 1.26.82 python
botocore 1.29.82 python
boto3 1.26.87 python
botocore 1.29.87 python
brotli-libs 1.0.9-r9 apk
bs4 0.0.1 python
busybox 1.35.0 binary
@@ -32,53 +32,53 @@ c-client 2007f-r14 apk
ca-certificates 20220614-r4 apk
ca-certificates-bundle 20220614-r4 apk
cachetools 5.3.0 python
certbot 2.3.0 python
certbot 2.4.0 python
certbot-dns-acmedns 0.1.0 python
certbot-dns-aliyun 0.38.1 python
certbot-dns-azure 1.5.0 python
certbot-dns-cloudflare 2.3.0 python
certbot-dns-aliyun 2.0.0 python
certbot-dns-azure 2.1.0 python
certbot-dns-cloudflare 2.4.0 python
certbot-dns-cpanel 0.4.0 python
certbot-dns-desec 1.2.1 python
certbot-dns-digitalocean 2.3.0 python
certbot-dns-digitalocean 2.4.0 python
certbot-dns-directadmin 1.0.3 python
certbot-dns-dnsimple 2.3.0 python
certbot-dns-dnsmadeeasy 2.3.0 python
certbot-dns-dnsimple 2.4.0 python
certbot-dns-dnsmadeeasy 2.4.0 python
certbot-dns-dnspod 0.1.0 python
certbot-dns-do 0.31.0 python
certbot-dns-domeneshop 0.2.9 python
certbot-dns-duckdns 1.2.1 python
certbot-dns-dynu 0.0.4 python
certbot-dns-gehirn 2.3.0 python
certbot-dns-gehirn 2.4.0 python
certbot-dns-godaddy 0.2.2 python
certbot-dns-google 2.3.0 python
certbot-dns-google 2.4.0 python
certbot-dns-he 1.0.0 python
certbot-dns-hetzner 2.0.0 python
certbot-dns-infomaniak 0.2.1 python
certbot-dns-inwx 2.2.0 python
certbot-dns-ionos 2022.11.24 python
certbot-dns-linode 2.3.0 python
certbot-dns-linode 2.4.0 python
certbot-dns-loopia 1.0.1 python
certbot-dns-luadns 2.3.0 python
certbot-dns-luadns 2.4.0 python
certbot-dns-netcup 1.2.0 python
certbot-dns-njalla 1.0.0 python
certbot-dns-nsone 2.3.0 python
certbot-dns-ovh 2.3.0 python
certbot-dns-nsone 2.4.0 python
certbot-dns-ovh 2.4.0 python
certbot-dns-porkbun 0.7 python
certbot-dns-rfc2136 2.3.0 python
certbot-dns-route53 2.3.0 python
certbot-dns-sakuracloud 2.3.0 python
certbot-dns-rfc2136 2.4.0 python
certbot-dns-route53 2.4.0 python
certbot-dns-sakuracloud 2.4.0 python
certbot-dns-standalone 1.1 python
certbot-dns-transip 0.5.2 python
certbot-dns-vultr 1.0.3 python
certbot-plugin-gandi 1.4.3 python
certifi 2022.12.7 python
cffi 1.15.1 python
charset-normalizer 3.0.1 python
charset-normalizer 3.1.0 python
cloudflare 2.11.1 python
configobj 5.0.8 python
coreutils 9.1-r0 apk
cryptography 39.0.1 python
curl 7.87.0-r2 apk
cryptography 39.0.2 python
curl 7.88.1-r0 apk
distro 1.8.0 python
dns-lexicon 3.11.7 python
dnslib 0.9.23 python
@@ -92,7 +92,6 @@ freetype 2.12.1-r0 apk
future 0.18.3 python
gdbm 1.23-r0 apk
git 2.38.4-r0 apk
git-perl 2.38.4-r0 apk
gmp 6.2.1-r2 apk
gnupg 2.2.40-r0 apk
gnupg-dirmngr 2.2.40-r0 apk
@@ -102,7 +101,7 @@ gnupg-wks-client 2.2.40-r0 apk
gnutls 3.7.8-r3 apk
google-api-core 2.11.0 python
google-api-python-client 2.80.0 python
google-auth 2.16.1 python
google-auth 2.16.2 python
google-auth-httplib2 0.1.0 python
googleapis-common-protos 1.58.0 python
gpg 2.2.40-r0 apk
@@ -193,6 +192,7 @@ musl-utils 1.2.3-r4 apk
nano 7.0-r0 apk
ncurses-libs 6.3_p20221119-r0 apk
ncurses-terminfo-base 6.3_p20221119-r0 apk
netcat-openbsd 1.130-r4 apk
nettle 3.8.1-r0 apk
nghttp2-libs 1.51.0-r0 apk
nginx 1.22.1-r0 apk
@@ -224,8 +224,6 @@ parsedatetime 2.6 python
pcre 8.45-r2 apk
pcre2 10.42-r0 apk
perl 5.36.0-r0 apk
perl-error 0.17029-r1 apk
perl-git 2.38.4-r0 apk
php-cli 8.1.16 binary
php-fpm 8.1.16 binary
php81 8.1.16-r0 apk
@@ -284,7 +282,7 @@ pkb-client 1.2 python
popt 1.19-r0 apk
portalocker 2.7.0 python
procps 3.3.17-r2 apk
protobuf 4.22.0 python
protobuf 4.22.1 python
pyOpenSSL 23.0.0 python
pyRFC3339 1.1 python
pyacmedns 0.4 python

View File

@@ -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." }

View File

@@ -1,30 +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/
fi
# copy crontab from system
if crontab -l -u root; then
crontab -l -u root >/config/crontabs/root
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
# 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 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
# 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