mirror of
				https://github.com/linuxserver/docker-swag.git
				synced 2025-10-31 13:07:44 +09:00 
			
		
		
		
	Add support for standalone DNS validation
This commit is contained in:
		| @@ -122,6 +122,7 @@ RUN \ | ||||
|     certbot-dns-ovh \ | ||||
|     certbot-dns-rfc2136 \ | ||||
|     certbot-dns-route53 \ | ||||
|     certbot-dns-standalone \ | ||||
|     certbot-dns-transip \ | ||||
|     certbot-dns-vultr \ | ||||
|     certbot-plugin-gandi \ | ||||
|   | ||||
| @@ -122,6 +122,7 @@ RUN \ | ||||
|     certbot-dns-ovh \ | ||||
|     certbot-dns-rfc2136 \ | ||||
|     certbot-dns-route53 \ | ||||
|     certbot-dns-standalone \ | ||||
|     certbot-dns-transip \ | ||||
|     certbot-dns-vultr \ | ||||
|     certbot-plugin-gandi \ | ||||
|   | ||||
| @@ -122,6 +122,7 @@ RUN \ | ||||
|     certbot-dns-ovh \ | ||||
|     certbot-dns-rfc2136 \ | ||||
|     certbot-dns-route53 \ | ||||
|     certbot-dns-standalone \ | ||||
|     certbot-dns-transip \ | ||||
|     certbot-dns-vultr \ | ||||
|     certbot-plugin-gandi \ | ||||
|   | ||||
| @@ -51,7 +51,7 @@ opt_param_usage_include_env: true | ||||
| opt_param_env_vars: | ||||
|   - { env_var: "SUBDOMAINS", env_value: "www,", desc: "Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this _exactly_ to `wildcard` (wildcard cert is available via `dns` and `duckdns` validation only)" } | ||||
|   - { env_var: "CERTPROVIDER", env_value: "", desc: "Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt." } | ||||
|   - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." } | ||||
|   - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `aliyun`, `cloudflare`, `cloudxns`, `cpanel`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `domeneshop`, `gandi`, `gehirn`, `google`, `he`, `hetzner`, `inwx`, `ionos`, `linode`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip` and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." } | ||||
|   - { env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins." } | ||||
|   - { env_var: "DUCKDNSTOKEN", env_value: "", desc: "Required if `VALIDATION` is set to `duckdns`. Retrieve your token from https://www.duckdns.org" } | ||||
|   - { env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." } | ||||
| @@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: "" | ||||
|  | ||||
| # changelog | ||||
| changelogs: | ||||
|   - { date: "06.11.21:", desc: "Added support for standalone DNS validation." } | ||||
|   - { date: "26.10.21:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) proxy.conf - Mitigate https://httpoxy.org/ vulnerabilities. Ref: https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-nginx#Defeating-the-Attack-using-NGINX-and-NGINX-Plus" } | ||||
|   - { date: "23.10.21:", desc: "Fix Hurricane Electric (HE) DNS validation." } | ||||
|   - { date: "12.10.21:", desc: "Fix deprecated LE root cert check to fix failures when using `STAGING=true`, and failures in revoking." } | ||||
|   | ||||
							
								
								
									
										8
									
								
								root/defaults/dns-conf/standalone.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								root/defaults/dns-conf/standalone.ini
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| # Instructions: https://github.com/siilike/certbot-dns-standalone/blob/master/README.rst | ||||
| # Make sure to expose UDP port 53 from your swag container: | ||||
| # - for docker cli, add argument: `-p 53:53/udp` | ||||
| # - for docker-compose, add the following line under ports: `- 53:53/udp` | ||||
| # This file does not need to be changed: | ||||
| # - no credentials are required | ||||
| # - it's not used and only for informational purpose | ||||
| # - prepare the correct DNS records as described in the plugin instructions instead | ||||
| @@ -122,7 +122,7 @@ if ! grep -q 'PARAMETERS' "/config/nginx/dhparams.pem"; then | ||||
| fi | ||||
|  | ||||
| # check to make sure DNSPLUGIN is selected if dns validation is used | ||||
| [[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|he|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|transip|vultr)$ ]] && \ | ||||
| [[ "$VALIDATION" = "dns" ]] && [[ ! "$DNSPLUGIN" =~ ^(aliyun|cloudflare|cloudxns|cpanel|digitalocean|directadmin|dnsimple|dnsmadeeasy|domeneshop|gandi|gehirn|google|he|hetzner|inwx|ionos|linode|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]] && \ | ||||
|     echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." && \ | ||||
|     sleep infinity | ||||
|  | ||||
| @@ -239,6 +239,9 @@ if [ "$VALIDATION" = "dns" ]; then | ||||
|     elif [[ "$DNSPLUGIN" =~ ^(aliyun|domeneshop|he|hetzner|inwx|ionos|netcup|njalla|transip|vultr)$ ]]; then | ||||
|         if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--dns-${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi | ||||
|         PREFCHAL="-a dns-${DNSPLUGIN} --dns-${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}" | ||||
|     elif [[ "$DNSPLUGIN" =~ ^(standalone)$ ]]; then | ||||
|         if [ -n "$PROPAGATION" ];then echo "standalone dns plugin does not support setting propagation time"; fi | ||||
|         PREFCHAL="-a dns-${DNSPLUGIN}" | ||||
|     elif [[ "$DNSPLUGIN" =~ ^(directadmin)$ ]]; then | ||||
|         if [ -n "$PROPAGATION" ];then PROPAGATIONPARAM="--${DNSPLUGIN}-propagation-seconds ${PROPAGATION}"; fi | ||||
|         PREFCHAL="-a ${DNSPLUGIN} --${DNSPLUGIN}-credentials /config/dns-conf/${DNSPLUGIN}.ini ${PROPAGATIONPARAM}" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user