Compare commits

...

5 Commits

Author SHA1 Message Date
LinuxServer-CI
db05a6b72b Bot Updating Package Versions 2025-01-08 01:24:02 +00:00
LinuxServer-CI
410fa0515e Bot Updating Package Versions 2025-01-07 10:29:27 +00:00
Adam
e1ece8ac1c Merge pull request #532 from linuxserver/more-3.21-migrations 2025-01-07 10:25:12 +00:00
thespad
d33df2224b Try and warn about confs looking at /etc for certs 2025-01-07 10:15:49 +00:00
thespad
3b98b3ae65 Simplify 2025-01-07 10:15:27 +00:00
3 changed files with 26 additions and 20 deletions

View File

@@ -1,7 +1,7 @@
NAME VERSION TYPE
Simple Launcher 1.1.0.14 dotnet (+5 duplicates)
acl-libs 2.3.2-r1 apk
acme 3.0.1 python
acme 3.1.0 python
alpine-baselayout 3.6.8-r1 apk
alpine-baselayout-data 3.6.8-r1 apk
alpine-keys 2.5-r0 apk
@@ -22,8 +22,8 @@ azure-mgmt-dns 8.2.0 python
backports-tarfile 1.2.0 python
bash 5.2.37-r0 apk
beautifulsoup4 4.12.3 python
boto3 1.35.92 python
botocore 1.35.92 python
boto3 1.35.94 python
botocore 1.35.94 python
brotli-libs 1.1.0-r2 apk
bs4 0.0.2 python
busybox 1.37.0-r9 apk
@@ -34,18 +34,18 @@ ca-certificates 20241121-r0 apk
ca-certificates-bundle 20241121-r0 apk
cachetools 5.5.0 python
catatonit 0.2.0-r0 apk
certbot 3.0.1 python
certbot 3.1.0 python
certbot-dns-acmedns 0.1.0 python
certbot-dns-aliyun 2.0.0 python
certbot-dns-azure 2.6.1 python
certbot-dns-bunny 3.0.0 python
certbot-dns-cloudflare 3.0.1 python
certbot-dns-cloudflare 3.1.0 python
certbot-dns-cpanel 0.4.0 python
certbot-dns-desec 1.2.1 python
certbot-dns-digitalocean 3.0.1 python
certbot-dns-digitalocean 3.1.0 python
certbot-dns-directadmin 1.0.13 python
certbot-dns-dnsimple 3.0.1 python
certbot-dns-dnsmadeeasy 3.0.1 python
certbot-dns-dnsimple 3.1.0 python
certbot-dns-dnsmadeeasy 3.1.0 python
certbot-dns-dnspod 0.1.0 python
certbot-dns-do 0.31.0 python
certbot-dns-domeneshop 0.2.9 python
@@ -53,27 +53,27 @@ certbot-dns-dreamhost 1.0 python
certbot-dns-duckdns 1.5 python
certbot-dns-dynudns 0.0.6 python
certbot-dns-freedns 0.2.0 python
certbot-dns-gehirn 3.0.1 python
certbot-dns-gehirn 3.1.0 python
certbot-dns-glesys 2.1.0 python
certbot-dns-godaddy 2.8.0 python
certbot-dns-google 3.0.1 python
certbot-dns-google 3.1.0 python
certbot-dns-he 1.0.0 python
certbot-dns-hetzner 2.0.1 python
certbot-dns-infomaniak 0.2.3 python
certbot-dns-inwx 3.0.1 python
certbot-dns-ionos 2024.11.9 python
certbot-dns-linode 3.0.1 python
certbot-dns-linode 3.1.0 python
certbot-dns-loopia 1.0.1 python
certbot-dns-luadns 3.0.1 python
certbot-dns-luadns 3.1.0 python
certbot-dns-namecheap 1.0.0 python
certbot-dns-netcup 1.4.4 python
certbot-dns-njalla 2.0.2 python
certbot-dns-nsone 3.0.1 python
certbot-dns-ovh 3.0.1 python
certbot-dns-nsone 3.1.0 python
certbot-dns-ovh 3.1.0 python
certbot-dns-porkbun 0.9.1 python
certbot-dns-rfc2136 3.0.1 python
certbot-dns-route53 3.0.1 python
certbot-dns-sakuracloud 3.0.1 python
certbot-dns-rfc2136 3.1.0 python
certbot-dns-route53 3.1.0 python
certbot-dns-sakuracloud 3.1.0 python
certbot-dns-standalone 1.1 python
certbot-dns-transip 0.5.2 python
certbot-dns-vultr 1.1.0 python

View File

@@ -11,3 +11,9 @@ if [[ -f /config/nginx/ldap.conf ]]; then
Ensure your configs are updated and remove /config/nginx/ldap.conf
If you do not use this config, simply remove it."
fi
if grep -qrle ' /etc/letsencrypt' /config/nginx; then
echo " The following nginx confs are using certificates from the obsolete location
/etc/letsencrypt and should be updated to point to /config/etc/letsencrypt
"
echo -n " " && grep -rle ' /etc/letsencrypt' /config/nginx
fi

View File

@@ -1,7 +1,7 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=bash
# Migrate existing confs with old paths from /etc/letsencrypt to /config/etc/letsencrypt
if [[ ! -f "/config/etc/letsencrypt/02-swag-old-certbot-paths" ]] && ls /config/etc/letsencrypt/renewal/*.conf >/dev/null 2>&1; then
sed -i 's| /etc/letsencrypt| /config/etc/letsencrypt|' /config/etc/letsencrypt/renewal/*.conf && touch /config/etc/letsencrypt/02-swag-old-certbot-paths
# Migrate existing renewal confs with old paths from /etc/letsencrypt to /config/etc/letsencrypt
if ls /config/etc/letsencrypt/renewal/*.conf >/dev/null 2>&1; then
sed -i 's| /etc/letsencrypt| /config/etc/letsencrypt|' /config/etc/letsencrypt/renewal/*.conf
fi