mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-12 13:15:15 +09:00
Compare commits
24 Commits
2.7.4-ls25
...
2.7.4-ls26
| Author | SHA1 | Date | |
|---|---|---|---|
|
52e8f7223e | ||
|
|
1abab5cb6d | ||
|
|
0061faef15 | ||
|
6e64bcbd7e | ||
|
|
b9dd1b7c5a | ||
|
|
e9bceab763 | ||
|
|
eba3c341fa | ||
|
|
5fc5825afd | ||
|
|
de18e4ef24 | ||
|
|
fbe212b67c | ||
|
|
2ca6807b64 | ||
|
|
e3560414dc | ||
|
|
2f4162578f | ||
|
|
2697b74a8c | ||
|
|
bd685533a2 | ||
|
|
82e85d22c1 | ||
|
|
8b49f2b0d4 | ||
|
|
8fdb472564 | ||
|
|
23728cba0b | ||
|
|
7e1db9c562 | ||
|
|
919b8ac152 | ||
|
|
0b738d9ee0 | ||
|
|
269e9cdd3f | ||
|
|
17387674b8 |
@@ -45,7 +45,7 @@ SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relatio
|
|||||||
|
|
||||||
## Supported Architectures
|
## Supported Architectures
|
||||||
|
|
||||||
We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
|
We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
|
||||||
|
|
||||||
Simply pulling `lscr.io/linuxserver/swag:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
Simply pulling `lscr.io/linuxserver/swag:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||||
|
|
||||||
@@ -401,6 +401,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404.
|
||||||
|
* **23.11.23:** - Run certbot as root to allow fix http validation.
|
||||||
* **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin.
|
* **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin.
|
||||||
* **28.08.23:** - Add Namecheap DNS plugin.
|
* **28.08.23:** - Add Namecheap DNS plugin.
|
||||||
* **12.08.23:** - Add FreeDNS plugin. Detect certbot DNS authenticators using CLI.
|
* **12.08.23:** - Add FreeDNS plugin. Detect certbot DNS authenticators using CLI.
|
||||||
|
|||||||
@@ -23,12 +23,12 @@ azure-mgmt-core 1.4.0 python
|
|||||||
azure-mgmt-dns 8.1.0 python
|
azure-mgmt-dns 8.1.0 python
|
||||||
bash 5.2.15-r5 apk
|
bash 5.2.15-r5 apk
|
||||||
beautifulsoup4 4.12.2 python
|
beautifulsoup4 4.12.2 python
|
||||||
boto3 1.28.85 python
|
boto3 1.33.6 python
|
||||||
botocore 1.31.85 python
|
botocore 1.33.6 python
|
||||||
brotli-libs 1.0.9-r14 apk
|
brotli-libs 1.0.9-r14 apk
|
||||||
bs4 0.0.1 python
|
bs4 0.0.1 python
|
||||||
busybox 1.36.1-r4 apk
|
busybox 1.36.1-r5 apk
|
||||||
busybox-binsh 1.36.1-r4 apk
|
busybox-binsh 1.36.1-r5 apk
|
||||||
c-client 2007f-r15 apk
|
c-client 2007f-r15 apk
|
||||||
ca-certificates 20230506-r0 apk
|
ca-certificates 20230506-r0 apk
|
||||||
ca-certificates-bundle 20230506-r0 apk
|
ca-certificates-bundle 20230506-r0 apk
|
||||||
@@ -65,7 +65,7 @@ certbot-dns-linode 2.6.0 python
|
|||||||
certbot-dns-loopia 1.0.1 python
|
certbot-dns-loopia 1.0.1 python
|
||||||
certbot-dns-luadns 2.6.0 python
|
certbot-dns-luadns 2.6.0 python
|
||||||
certbot-dns-namecheap 1.0.0 python
|
certbot-dns-namecheap 1.0.0 python
|
||||||
certbot-dns-netcup 1.3.1 python
|
certbot-dns-netcup 1.4.3 python
|
||||||
certbot-dns-njalla 1.0.0 python
|
certbot-dns-njalla 1.0.0 python
|
||||||
certbot-dns-nsone 2.6.0 python
|
certbot-dns-nsone 2.6.0 python
|
||||||
certbot-dns-ovh 2.6.0 python
|
certbot-dns-ovh 2.6.0 python
|
||||||
@@ -77,13 +77,13 @@ certbot-dns-standalone 1.1 python
|
|||||||
certbot-dns-transip 0.5.2 python
|
certbot-dns-transip 0.5.2 python
|
||||||
certbot-dns-vultr 1.1.0 python
|
certbot-dns-vultr 1.1.0 python
|
||||||
certbot-plugin-gandi 1.5.0 python
|
certbot-plugin-gandi 1.5.0 python
|
||||||
certifi 2023.7.22 python
|
certifi 2023.11.17 python
|
||||||
cffi 1.16.0 python
|
cffi 1.16.0 python
|
||||||
charset-normalizer 3.3.2 python
|
charset-normalizer 3.3.2 python
|
||||||
cloudflare 2.12.4 python
|
cloudflare 2.14.2 python
|
||||||
configobj 5.0.8 python
|
configobj 5.0.8 python
|
||||||
coreutils 9.3-r1 apk
|
coreutils 9.3-r1 apk
|
||||||
cryptography 41.0.5 python
|
cryptography 41.0.7 python
|
||||||
curl 8.4.0-r0 apk
|
curl 8.4.0-r0 apk
|
||||||
dataclasses-json 0.5.14 python
|
dataclasses-json 0.5.14 python
|
||||||
distro 1.8.0 python
|
distro 1.8.0 python
|
||||||
@@ -110,8 +110,8 @@ gnupg-utils 2.4.3-r0 apk
|
|||||||
gnupg-wks-client 2.4.3-r0 apk
|
gnupg-wks-client 2.4.3-r0 apk
|
||||||
gnutls 3.8.0-r2 apk
|
gnutls 3.8.0-r2 apk
|
||||||
google-api-core 2.14.0 python
|
google-api-core 2.14.0 python
|
||||||
google-api-python-client 2.107.0 python
|
google-api-python-client 2.109.0 python
|
||||||
google-auth 2.23.4 python
|
google-auth 2.24.0 python
|
||||||
google-auth-httplib2 0.1.1 python
|
google-auth-httplib2 0.1.1 python
|
||||||
googleapis-common-protos 1.61.0 python
|
googleapis-common-protos 1.61.0 python
|
||||||
gpg 2.4.3-r0 apk
|
gpg 2.4.3-r0 apk
|
||||||
@@ -122,8 +122,8 @@ gpgv 2.4.3-r0 apk
|
|||||||
httplib2 0.22.0 python
|
httplib2 0.22.0 python
|
||||||
icu-data-en 73.2-r2 apk
|
icu-data-en 73.2-r2 apk
|
||||||
icu-libs 73.2-r2 apk
|
icu-libs 73.2-r2 apk
|
||||||
idna 3.4 python
|
idna 3.6 python
|
||||||
importlib-metadata 6.8.0 python
|
importlib-metadata 6.9.0 python
|
||||||
ip6tables 1.8.9-r2 apk
|
ip6tables 1.8.9-r2 apk
|
||||||
iptables 1.8.9-r2 apk
|
iptables 1.8.9-r2 apk
|
||||||
isodate 0.6.1 python
|
isodate 0.6.1 python
|
||||||
@@ -165,7 +165,7 @@ libncursesw 6.4_p20230506-r0 apk
|
|||||||
libnftnl 1.2.5-r1 apk
|
libnftnl 1.2.5-r1 apk
|
||||||
libpanelw 6.4_p20230506-r0 apk
|
libpanelw 6.4_p20230506-r0 apk
|
||||||
libpng 1.6.39-r3 apk
|
libpng 1.6.39-r3 apk
|
||||||
libpq 15.4-r0 apk
|
libpq 15.5-r0 apk
|
||||||
libproc2 4.0.4-r0 apk
|
libproc2 4.0.4-r0 apk
|
||||||
libsasl 2.1.28-r4 apk
|
libsasl 2.1.28-r4 apk
|
||||||
libseccomp 2.5.4-r2 apk
|
libseccomp 2.5.4-r2 apk
|
||||||
@@ -182,7 +182,7 @@ libxau 1.0.11-r2 apk
|
|||||||
libxcb 1.15-r1 apk
|
libxcb 1.15-r1 apk
|
||||||
libxdmcp 1.1.4-r2 apk
|
libxdmcp 1.1.4-r2 apk
|
||||||
libxext 1.3.5-r2 apk
|
libxext 1.3.5-r2 apk
|
||||||
libxml2 2.11.4-r0 apk
|
libxml2 2.11.6-r0 apk
|
||||||
libxpm 3.5.16-r1 apk
|
libxpm 3.5.16-r1 apk
|
||||||
libxslt 1.1.38-r0 apk
|
libxslt 1.1.38-r0 apk
|
||||||
libxt 1.3.0-r2 apk
|
libxt 1.3.0-r2 apk
|
||||||
@@ -233,70 +233,70 @@ packaging 23.2 python
|
|||||||
parsedatetime 2.6 python
|
parsedatetime 2.6 python
|
||||||
pcre 8.45-r3 apk
|
pcre 8.45-r3 apk
|
||||||
pcre2 10.42-r1 apk
|
pcre2 10.42-r1 apk
|
||||||
perl 5.36.1-r2 apk
|
perl 5.36.2-r0 apk
|
||||||
perl-error 0.17029-r1 apk
|
perl-error 0.17029-r1 apk
|
||||||
perl-git 2.40.1-r0 apk
|
perl-git 2.40.1-r0 apk
|
||||||
php82 8.2.12-r0 apk
|
php82 8.2.13-r0 apk
|
||||||
php82-bcmath 8.2.12-r0 apk
|
php82-bcmath 8.2.13-r0 apk
|
||||||
php82-bz2 8.2.12-r0 apk
|
php82-bz2 8.2.13-r0 apk
|
||||||
php82-common 8.2.12-r0 apk
|
php82-common 8.2.13-r0 apk
|
||||||
php82-ctype 8.2.12-r0 apk
|
php82-ctype 8.2.13-r0 apk
|
||||||
php82-curl 8.2.12-r0 apk
|
php82-curl 8.2.13-r0 apk
|
||||||
php82-dom 8.2.12-r0 apk
|
php82-dom 8.2.13-r0 apk
|
||||||
php82-exif 8.2.12-r0 apk
|
php82-exif 8.2.13-r0 apk
|
||||||
php82-fileinfo 8.2.12-r0 apk
|
php82-fileinfo 8.2.13-r0 apk
|
||||||
php82-fpm 8.2.12-r0 apk
|
php82-fpm 8.2.13-r0 apk
|
||||||
php82-ftp 8.2.12-r0 apk
|
php82-ftp 8.2.13-r0 apk
|
||||||
php82-gd 8.2.12-r0 apk
|
php82-gd 8.2.13-r0 apk
|
||||||
php82-gmp 8.2.12-r0 apk
|
php82-gmp 8.2.13-r0 apk
|
||||||
php82-iconv 8.2.12-r0 apk
|
php82-iconv 8.2.13-r0 apk
|
||||||
php82-imap 8.2.12-r0 apk
|
php82-imap 8.2.13-r0 apk
|
||||||
php82-intl 8.2.12-r0 apk
|
php82-intl 8.2.13-r0 apk
|
||||||
php82-ldap 8.2.12-r0 apk
|
php82-ldap 8.2.13-r0 apk
|
||||||
php82-mbstring 8.2.12-r0 apk
|
php82-mbstring 8.2.13-r0 apk
|
||||||
php82-mysqli 8.2.12-r0 apk
|
php82-mysqli 8.2.13-r0 apk
|
||||||
php82-mysqlnd 8.2.12-r0 apk
|
php82-mysqlnd 8.2.13-r0 apk
|
||||||
php82-opcache 8.2.12-r0 apk
|
php82-opcache 8.2.13-r0 apk
|
||||||
php82-openssl 8.2.12-r0 apk
|
php82-openssl 8.2.13-r0 apk
|
||||||
php82-pdo 8.2.12-r0 apk
|
php82-pdo 8.2.13-r0 apk
|
||||||
php82-pdo_mysql 8.2.12-r0 apk
|
php82-pdo_mysql 8.2.13-r0 apk
|
||||||
php82-pdo_odbc 8.2.12-r0 apk
|
php82-pdo_odbc 8.2.13-r0 apk
|
||||||
php82-pdo_pgsql 8.2.12-r0 apk
|
php82-pdo_pgsql 8.2.13-r0 apk
|
||||||
php82-pdo_sqlite 8.2.12-r0 apk
|
php82-pdo_sqlite 8.2.13-r0 apk
|
||||||
php82-pear 8.2.12-r0 apk
|
php82-pear 8.2.13-r0 apk
|
||||||
php82-pecl-apcu 5.1.22-r0 apk
|
php82-pecl-apcu 5.1.22-r0 apk
|
||||||
php82-pecl-igbinary 3.2.14-r0 apk
|
php82-pecl-igbinary 3.2.14-r0 apk
|
||||||
php82-pecl-mcrypt 1.0.6-r0 apk
|
php82-pecl-mcrypt 1.0.6-r0 apk
|
||||||
php82-pecl-memcached 3.2.0-r1 apk
|
php82-pecl-memcached 3.2.0-r1 apk
|
||||||
php82-pecl-msgpack 2.2.0-r0 apk
|
php82-pecl-msgpack 2.2.0-r0 apk
|
||||||
php82-pecl-redis 6.0.2-r0 apk
|
php82-pecl-redis 6.0.2-r0 apk
|
||||||
php82-pgsql 8.2.12-r0 apk
|
php82-pgsql 8.2.13-r0 apk
|
||||||
php82-phar 8.2.12-r0 apk
|
php82-phar 8.2.13-r0 apk
|
||||||
php82-posix 8.2.12-r0 apk
|
php82-posix 8.2.13-r0 apk
|
||||||
php82-session 8.2.12-r0 apk
|
php82-session 8.2.13-r0 apk
|
||||||
php82-simplexml 8.2.12-r0 apk
|
php82-simplexml 8.2.13-r0 apk
|
||||||
php82-soap 8.2.12-r0 apk
|
php82-soap 8.2.13-r0 apk
|
||||||
php82-sockets 8.2.12-r0 apk
|
php82-sockets 8.2.13-r0 apk
|
||||||
php82-sodium 8.2.12-r0 apk
|
php82-sodium 8.2.13-r0 apk
|
||||||
php82-sqlite3 8.2.12-r0 apk
|
php82-sqlite3 8.2.13-r0 apk
|
||||||
php82-tokenizer 8.2.12-r0 apk
|
php82-tokenizer 8.2.13-r0 apk
|
||||||
php82-xml 8.2.12-r0 apk
|
php82-xml 8.2.13-r0 apk
|
||||||
php82-xmlreader 8.2.12-r0 apk
|
php82-xmlreader 8.2.13-r0 apk
|
||||||
php82-xmlwriter 8.2.12-r0 apk
|
php82-xmlwriter 8.2.13-r0 apk
|
||||||
php82-xsl 8.2.12-r0 apk
|
php82-xsl 8.2.13-r0 apk
|
||||||
php82-zip 8.2.12-r0 apk
|
php82-zip 8.2.13-r0 apk
|
||||||
pinentry 1.2.1-r1 apk
|
pinentry 1.2.1-r1 apk
|
||||||
pip 23.3.1 python
|
pip 23.3.1 python
|
||||||
pkb-client 1.2 python
|
pkb-client 1.2 python
|
||||||
popt 1.19-r2 apk
|
popt 1.19-r2 apk
|
||||||
portalocker 2.8.2 python
|
portalocker 2.8.2 python
|
||||||
procps-ng 4.0.4-r0 apk
|
procps-ng 4.0.4-r0 apk
|
||||||
protobuf 4.25.0 python
|
protobuf 4.25.1 python
|
||||||
publicsuffixlist 0.9.4 python
|
publicsuffixlist 0.9.4 python
|
||||||
pyOpenSSL 23.3.0 python
|
pyOpenSSL 23.3.0 python
|
||||||
pyRFC3339 1.1 python
|
pyRFC3339 1.1 python
|
||||||
pyacmedns 0.4 python
|
pyacmedns 0.4 python
|
||||||
pyasn1 0.5.0 python
|
pyasn1 0.5.1 python
|
||||||
pyasn1-modules 0.3.0 python
|
pyasn1-modules 0.3.0 python
|
||||||
pyc 0.1-r0 apk
|
pyc 0.1-r0 apk
|
||||||
pycparser 2.21 python
|
pycparser 2.21 python
|
||||||
@@ -313,7 +313,7 @@ requests 2.31.0 python
|
|||||||
requests-file 1.5.1 python
|
requests-file 1.5.1 python
|
||||||
requests-mock 1.11.0 python
|
requests-mock 1.11.0 python
|
||||||
rsa 4.9 python
|
rsa 4.9 python
|
||||||
s3transfer 0.7.0 python
|
s3transfer 0.8.2 python
|
||||||
scanelf 1.3.7-r1 apk
|
scanelf 1.3.7-r1 apk
|
||||||
setuptools 65.5.0 python
|
setuptools 65.5.0 python
|
||||||
shadow 4.13-r4 apk
|
shadow 4.13-r4 apk
|
||||||
@@ -321,9 +321,9 @@ six 1.16.0 python
|
|||||||
skalibs 2.13.1.1-r1 apk
|
skalibs 2.13.1.1-r1 apk
|
||||||
soupsieve 2.5 python
|
soupsieve 2.5 python
|
||||||
sqlite-libs 3.41.2-r2 apk
|
sqlite-libs 3.41.2-r2 apk
|
||||||
ssl_client 1.36.1-r4 apk
|
ssl_client 1.36.1-r5 apk
|
||||||
tiff 4.5.1-r0 apk
|
tiff 4.5.1-r0 apk
|
||||||
tldextract 5.1.0 python
|
tldextract 5.1.1 python
|
||||||
typing-inspect 0.9.0 python
|
typing-inspect 0.9.0 python
|
||||||
typing_extensions 4.8.0 python
|
typing_extensions 4.8.0 python
|
||||||
tzdata 2023c-r1 apk
|
tzdata 2023c-r1 apk
|
||||||
@@ -331,7 +331,7 @@ unixodbc 2.3.11-r2 apk
|
|||||||
uritemplate 4.1.1 python
|
uritemplate 4.1.1 python
|
||||||
urllib3 1.26.18 python
|
urllib3 1.26.18 python
|
||||||
utmps-libs 0.1.2.1-r1 apk
|
utmps-libs 0.1.2.1-r1 apk
|
||||||
wheel 0.41.3 python
|
wheel 0.42.0 python
|
||||||
whois 5.5.17-r0 apk
|
whois 5.5.17-r0 apk
|
||||||
xz-libs 5.4.3-r0 apk
|
xz-libs 5.4.3-r0 apk
|
||||||
zipp 3.17.0 python
|
zipp 3.17.0 python
|
||||||
|
|||||||
@@ -153,6 +153,8 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." }
|
||||||
|
- { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." }
|
||||||
- { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." }
|
- { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin DNS plugin." }
|
||||||
- { date: "28.08.23:", desc: "Add Namecheap DNS plugin." }
|
- { date: "28.08.23:", desc: "Add Namecheap DNS plugin." }
|
||||||
- { date: "12.08.23:", desc: "Add FreeDNS plugin. Detect certbot DNS authenticators using CLI." }
|
- { date: "12.08.23:", desc: "Add FreeDNS plugin. Detect certbot DNS authenticators using CLI." }
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
## Version 2023/06/05 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
## Version 2023/11/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||||
|
|
||||||
# redirect all traffic to https
|
# redirect all traffic to https
|
||||||
server {
|
server {
|
||||||
@@ -48,7 +48,7 @@ server {
|
|||||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
# enable for Authentik (requires authentik-server.conf in the server block)
|
||||||
#include /config/nginx/authentik-location.conf;
|
#include /config/nginx/authentik-location.conf;
|
||||||
|
|
||||||
try_files $uri $uri/ /index.html /index.php$is_args$args =404;
|
try_files $uri $uri/ /index.html /index.php$is_args$args;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^(.+\.php)(.*)$ {
|
location ~ ^(.+\.php)(.*)$ {
|
||||||
@@ -65,6 +65,7 @@ server {
|
|||||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
# enable for Authentik (requires authentik-server.conf in the server block)
|
||||||
#include /config/nginx/authentik-location.conf;
|
#include /config/nginx/authentik-location.conf;
|
||||||
|
|
||||||
|
try_files $fastcgi_script_name =404;
|
||||||
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
fastcgi_split_path_info ^(.+\.php)(.*)$;
|
||||||
fastcgi_pass 127.0.0.1:9000;
|
fastcgi_pass 127.0.0.1:9000;
|
||||||
fastcgi_index index.php;
|
fastcgi_index index.php;
|
||||||
|
|||||||
@@ -1,9 +1,2 @@
|
|||||||
# do daily/weekly/monthly maintenance
|
|
||||||
# min hour day month weekday command
|
# min hour day month weekday command
|
||||||
*/15 * * * * run-parts /etc/periodic/15min
|
|
||||||
0 * * * * run-parts /etc/periodic/hourly
|
|
||||||
0 2 * * * run-parts /etc/periodic/daily
|
|
||||||
0 3 * * 6 run-parts /etc/periodic/weekly
|
|
||||||
0 5 1 * * run-parts /etc/periodic/monthly
|
|
||||||
# renew letsencrypt certs
|
|
||||||
8 2 * * * /app/le-renew.sh >> /config/log/letsencrypt/letsencrypt.log 2>&1
|
8 2 * * * /app/le-renew.sh >> /config/log/letsencrypt/letsencrypt.log 2>&1
|
||||||
|
|||||||
@@ -31,6 +31,12 @@ if [[ "${VALIDATION}" = "dns" ]] && ! echo "${CERTBOT_DNS_AUTHENTICATORS}" | gre
|
|||||||
sleep infinity
|
sleep infinity
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# set owner of certbot's CONFIG_DIR, WORK_DIR, and LOGS_DIR to abc
|
||||||
|
lsiown -R abc:abc \
|
||||||
|
/etc/letsencrypt \
|
||||||
|
/var/lib/letsencrypt \
|
||||||
|
/var/log/letsencrypt
|
||||||
|
|
||||||
# set_ini_value logic:
|
# set_ini_value logic:
|
||||||
# - if the name is not found in the file, append the name=value to the end of the file
|
# - if the name is not found in the file, append the name=value to the end of the file
|
||||||
# - if the name is found in the file, replace the value
|
# - if the name is found in the file, replace the value
|
||||||
@@ -46,6 +52,7 @@ function set_ini_value() {
|
|||||||
|
|
||||||
# ensure config files exist and has at least one value set (set_ini_value does not work on empty files)
|
# ensure config files exist and has at least one value set (set_ini_value does not work on empty files)
|
||||||
touch /config/etc/letsencrypt/cli.ini
|
touch /config/etc/letsencrypt/cli.ini
|
||||||
|
lsiown abc:abc /config/etc/letsencrypt/cli.ini
|
||||||
grep -qF 'agree-tos' /config/etc/letsencrypt/cli.ini || echo 'agree-tos=true' >>/config/etc/letsencrypt/cli.ini
|
grep -qF 'agree-tos' /config/etc/letsencrypt/cli.ini || echo 'agree-tos=true' >>/config/etc/letsencrypt/cli.ini
|
||||||
|
|
||||||
# copy dns default configs
|
# copy dns default configs
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
|
||||||
# shellcheck shell=bash
|
|
||||||
|
|
||||||
# make folders
|
|
||||||
mkdir -p \
|
|
||||||
/config/crontabs
|
|
||||||
|
|
||||||
## root
|
|
||||||
# if crontabs do not exist in config
|
|
||||||
if [[ ! -f /config/crontabs/root ]]; then
|
|
||||||
# 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/ 2> >(grep -v 'cp: not replacing')
|
|
||||||
fi
|
|
||||||
# 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/ 2> >(grep -v 'cp: not replacing')
|
|
||||||
fi
|
|
||||||
# set permissions and import user crontabs
|
|
||||||
lsiown abc:abc /config/crontabs/abc
|
|
||||||
crontab -u abc /config/crontabs/abc
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
oneshot
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/etc/s6-overlay/s6-rc.d/init-crontabs-config/run
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
# make our folders and links
|
# make our folders and links
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
/config/{fail2ban,crontabs,dns-conf} \
|
/config/{fail2ban,dns-conf} \
|
||||||
/config/etc/letsencrypt/renewal-hooks \
|
/config/etc/letsencrypt/renewal-hooks \
|
||||||
/config/log/{fail2ban,letsencrypt,nginx} \
|
/config/log/{fail2ban,letsencrypt,nginx} \
|
||||||
/config/nginx/proxy-confs \
|
/config/nginx/proxy-confs \
|
||||||
|
|||||||
Reference in New Issue
Block a user