mirror of
				https://github.com/linuxserver/docker-swag.git
				synced 2025-11-01 05:27:42 +09:00 
			
		
		
		
	Merge pull request #302 from linuxserver/sym-certs
Relocate live cert symlink
This commit is contained in:
		| @@ -194,10 +194,6 @@ if [ "$ONLY_SUBDOMAINS" = "true" ] && [ ! "$SUBDOMAINS" = "wildcard" ]; then | |||||||
| else | else | ||||||
|     ln -s ../etc/letsencrypt/live/"$URL" /config/keys/letsencrypt |     ln -s ../etc/letsencrypt/live/"$URL" /config/keys/letsencrypt | ||||||
| fi | fi | ||||||
| rm -rf /config/keys/cert.crt |  | ||||||
| ln -s ./letsencrypt/fullchain.pem /config/keys/cert.crt |  | ||||||
| rm -rf /config/keys/cert.key |  | ||||||
| ln -s ./letsencrypt/privkey.pem /config/keys/cert.key |  | ||||||
|  |  | ||||||
| # checking for changes in cert variables, revoking certs if necessary | # checking for changes in cert variables, revoking certs if necessary | ||||||
| if [ ! "$URL" = "$ORIGURL" ] || [ ! "$SUBDOMAINS" = "$ORIGSUBDOMAINS" ] || [ ! "$ONLY_SUBDOMAINS" = "$ORIGONLY_SUBDOMAINS" ] || [ ! "$EXTRA_DOMAINS" = "$ORIGEXTRA_DOMAINS" ] || [ ! "$VALIDATION" = "$ORIGVALIDATION" ] || [ ! "$DNSPLUGIN" = "$ORIGDNSPLUGIN" ] || [ ! "$PROPAGATION" = "$ORIGPROPAGATION" ] || [ ! "$STAGING" = "$ORIGSTAGING" ] || [ ! "$CERTPROVIDER" = "$ORIGCERTPROVIDER" ]; then | if [ ! "$URL" = "$ORIGURL" ] || [ ! "$SUBDOMAINS" = "$ORIGSUBDOMAINS" ] || [ ! "$ONLY_SUBDOMAINS" = "$ORIGONLY_SUBDOMAINS" ] || [ ! "$EXTRA_DOMAINS" = "$ORIGEXTRA_DOMAINS" ] || [ ! "$VALIDATION" = "$ORIGVALIDATION" ] || [ ! "$DNSPLUGIN" = "$ORIGDNSPLUGIN" ] || [ ! "$PROPAGATION" = "$ORIGPROPAGATION" ] || [ ! "$STAGING" = "$ORIGSTAGING" ] || [ ! "$CERTPROVIDER" = "$ORIGCERTPROVIDER" ]; then | ||||||
| @@ -276,3 +272,11 @@ if [ ! -f "/config/keys/letsencrypt/fullchain.pem" ]; then | |||||||
| else | else | ||||||
|     echo "Certificate exists; parameters unchanged; starting nginx" |     echo "Certificate exists; parameters unchanged; starting nginx" | ||||||
| fi | fi | ||||||
|  |  | ||||||
|  | # if certbot generated key exists, remove self-signed cert and replace it with symlink to live cert | ||||||
|  | if [ -d /config/keys/letsencrypt ]; then | ||||||
|  |     rm -rf /config/keys/cert.crt | ||||||
|  |     ln -s ./letsencrypt/fullchain.pem /config/keys/cert.crt | ||||||
|  |     rm -rf /config/keys/cert.key | ||||||
|  |     ln -s ./letsencrypt/privkey.pem /config/keys/cert.key | ||||||
|  | fi | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user