Compare commits

...

13 Commits

Author SHA1 Message Date
LinuxServer-CI
8a90cf85d8 Bot Updating Package Versions 2023-10-01 16:32:35 +00:00
LinuxServer-CI
fd958fe6b3 Bot Updating Templated Files 2023-10-01 16:29:08 +00:00
Eric Nemchik
eb8f12b5de Merge pull request #412 from Platzii/directadmin-fix
Fix "unrecognized arguments" issue in DirectAdmin DNS plugin
2023-10-01 11:27:34 -05:00
Simon Lepla
dae223ca0f Fix "unrecognized arguments" issue in DirectAdmin DNS plugin 2023-10-01 12:07:41 +02:00
LinuxServer-CI
14226ce700 Bot Updating Package Versions 2023-09-30 03:22:11 +00:00
LinuxServer-CI
b64bb62303 Bot Updating Package Versions 2023-09-23 03:18:35 +00:00
LinuxServer-CI
f478a200e8 Bot Updating Package Versions 2023-09-19 19:17:39 +00:00
LinuxServer-CI
40200982d1 Bot Updating Package Versions 2023-09-19 19:12:05 +00:00
Adam
3476f8b6f6 Merge pull request #406 from linuxserver/namecheap 2023-09-19 20:08:26 +01:00
LinuxServer-CI
3e9dc80ed4 Bot Updating Package Versions 2023-09-16 03:17:06 +00:00
LinuxServer-CI
4486d528d1 Bot Updating Package Versions 2023-09-09 03:19:54 +00:00
LinuxServer-CI
e0032ecfd4 Bot Updating Package Versions 2023-09-02 03:16:49 +00:00
Eric Nemchik
b1c1262a2c Add Namecheap DNS plugin
Signed-off-by: GitHub <noreply@github.com>
2023-08-28 14:38:34 +00:00
7 changed files with 94 additions and 82 deletions

View File

@@ -118,6 +118,7 @@ RUN \
certbot-dns-linode \
certbot-dns-loopia \
certbot-dns-luadns \
certbot-dns-namecheap \
certbot-dns-netcup \
certbot-dns-njalla \
certbot-dns-nsone \

View File

@@ -118,6 +118,7 @@ RUN \
certbot-dns-linode \
certbot-dns-loopia \
certbot-dns-luadns \
certbot-dns-namecheap \
certbot-dns-netcup \
certbot-dns-njalla \
certbot-dns-nsone \

View File

@@ -215,7 +215,7 @@ Container images are configured using parameters passed at runtime (such as thos
| `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). |
| `-e SUBDOMAINS=www,` | 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` validation only) |
| `-e CERTPROVIDER=` | 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. |
| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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`. |
| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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`. |
| `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
| `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
| `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` |
@@ -336,6 +336,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **01.10.23:** - Fix "unrecognized arguments" issue in DirectAdmin DNS plugin.
* **28.08.23:** - Add Namecheap DNS plugin.
* **12.08.23:** - Add FreeDNS plugin. Detect certbot DNS authenticators using CLI.
* **07.08.23:** - Add Bunny DNS Configuration.
* **27.07.23:** - Added support for dreamhost validation.

View File

@@ -1,6 +1,7 @@
NAME VERSION TYPE
ConfigArgParse 1.7 python
PyJWT 2.8.0 python
PyNamecheap 0.0.3 python
PyYAML 6.0.1 python
Simple Launcher Executable 1.1.0.14 dotnet
acme 2.6.0 python
@@ -16,14 +17,14 @@ apr-util 1.6.3-r1 apk
argon2-libs 20190702-r4 apk
attrs 23.1.0 python
azure-common 1.1.28 python
azure-core 1.29.3 python
azure-core 1.29.4 python
azure-identity 1.14.0 python
azure-mgmt-core 1.4.0 python
azure-mgmt-dns 8.1.0 python
bash 5.2.15-r5 apk
beautifulsoup4 4.12.2 python
boto3 1.28.35 python
botocore 1.31.35 python
boto3 1.28.57 python
botocore 1.31.57 python
brotli-libs 1.0.9-r14 apk
bs4 0.0.1 python
busybox 1.36.1-r2 apk
@@ -63,7 +64,8 @@ certbot-dns-ionos 2022.11.24 python
certbot-dns-linode 2.6.0 python
certbot-dns-loopia 1.0.1 python
certbot-dns-luadns 2.6.0 python
certbot-dns-netcup 1.3.0 python
certbot-dns-namecheap 1.0.0 python
certbot-dns-netcup 1.3.1 python
certbot-dns-njalla 1.0.0 python
certbot-dns-nsone 2.6.0 python
certbot-dns-ovh 2.6.0 python
@@ -76,13 +78,13 @@ certbot-dns-transip 0.5.2 python
certbot-dns-vultr 1.1.0 python
certbot-plugin-gandi 1.4.3 python
certifi 2023.7.22 python
cffi 1.15.1 python
charset-normalizer 3.2.0 python
cloudflare 2.11.7 python
cffi 1.16.0 python
charset-normalizer 3.3.0 python
cloudflare 2.12.4 python
configobj 5.0.8 python
coreutils 9.3-r1 apk
cryptography 41.0.3 python
curl 8.2.1-r0 apk
cryptography 41.0.4 python
curl 8.3.0-r0 apk
dataclasses-json 0.5.14 python
distro 1.8.0 python
dns-lexicon 3.11.7 python
@@ -92,7 +94,7 @@ domeneshop 0.4.3 python
fail2ban 1.0.2 python
fail2ban 1.0.2-r2 apk
fail2ban-pyc 1.0.2-r2 apk
filelock 3.12.2 python
filelock 3.12.4 python
fontconfig 2.14.2-r3 apk
freetype 2.13.0-r5 apk
future 0.18.3 python
@@ -107,10 +109,10 @@ gnupg-keyboxd 2.4.3-r0 apk
gnupg-utils 2.4.3-r0 apk
gnupg-wks-client 2.4.3-r0 apk
gnutls 3.8.0-r2 apk
google-api-core 2.11.1 python
google-api-python-client 2.97.0 python
google-auth 2.22.0 python
google-auth-httplib2 0.1.0 python
google-api-core 2.12.0 python
google-api-python-client 2.101.0 python
google-auth 2.23.2 python
google-auth-httplib2 0.1.1 python
googleapis-common-protos 1.60.0 python
gpg 2.4.3-r0 apk
gpg-agent 2.4.3-r0 apk
@@ -128,7 +130,7 @@ isodate 0.6.1 python
jmespath 1.0.1 python
josepy 1.13.0 python
jq 1.6-r3 apk
jsonlines 3.1.0 python
jsonlines 4.0.0 python
jsonpickle 3.0.2 python
libacl 2.3.1-r3 apk
libassuan 2.5.6-r0 apk
@@ -137,8 +139,8 @@ libavif 0.11.1-r2 apk
libbsd 0.11.7-r1 apk
libbz2 1.0.8-r5 apk
libc-utils 0.7.2-r5 apk
libcrypto3 3.1.2-r0 apk
libcurl 8.2.1-r0 apk
libcrypto3 3.1.3-r0 apk
libcurl 8.3.0-r0 apk
libdav1d 1.2.1-r0 apk
libedit 20221030.3.1-r1 apk
libevent 2.1.12-r6 apk
@@ -164,17 +166,17 @@ libnftnl 1.2.5-r1 apk
libpanelw 6.4_p20230506-r0 apk
libpng 1.6.39-r3 apk
libpq 15.4-r0 apk
libproc2 4.0.3-r1 apk
libproc2 4.0.4-r0 apk
libsasl 2.1.28-r4 apk
libseccomp 2.5.4-r2 apk
libsm 1.2.4-r1 apk
libsodium 1.0.18-r3 apk
libssl3 3.1.2-r0 apk
libssl3 3.1.3-r0 apk
libstdc++ 12.2.1_git20220924-r10 apk
libtasn1 4.19.0-r1 apk
libunistring 1.1-r1 apk
libuuid 2.38.1-r8 apk
libwebp 1.3.1-r0 apk
libwebp 1.3.2-r0 apk
libx11 1.8.4-r4 apk
libxau 1.0.11-r2 apk
libxcb 1.15-r1 apk
@@ -194,7 +196,7 @@ marshmallow 3.20.1 python
memcached 1.6.21-r0 apk
mock 5.1.0 python
mpdecimal 2.5.1-r2 apk
msal 1.23.0 python
msal 1.24.1 python
msal-extensions 1.0.0 python
musl 1.2.4-r1 apk
musl-utils 1.2.4-r1 apk
@@ -225,71 +227,71 @@ nginx-mod-stream-geoip2 1.24.0-r6 apk
nginx-vim 1.24.0-r6 apk
npth 1.6-r4 apk
oniguruma 6.9.8-r1 apk
openssl 3.1.2-r0 apk
openssl 3.1.3-r0 apk
p11-kit 0.24.1-r2 apk
packaging 23.1 python
packaging 23.2 python
parsedatetime 2.6 python
pcre 8.45-r3 apk
pcre2 10.42-r1 apk
perl 5.36.1-r2 apk
perl-error 0.17029-r1 apk
perl-git 2.40.1-r0 apk
php82 8.2.8-r0 apk
php82-bcmath 8.2.8-r0 apk
php82-bz2 8.2.8-r0 apk
php82-common 8.2.8-r0 apk
php82-ctype 8.2.8-r0 apk
php82-curl 8.2.8-r0 apk
php82-dom 8.2.8-r0 apk
php82-exif 8.2.8-r0 apk
php82-fileinfo 8.2.8-r0 apk
php82-fpm 8.2.8-r0 apk
php82-ftp 8.2.8-r0 apk
php82-gd 8.2.8-r0 apk
php82-gmp 8.2.8-r0 apk
php82-iconv 8.2.8-r0 apk
php82-imap 8.2.8-r0 apk
php82-intl 8.2.8-r0 apk
php82-ldap 8.2.8-r0 apk
php82-mbstring 8.2.8-r0 apk
php82-mysqli 8.2.8-r0 apk
php82-mysqlnd 8.2.8-r0 apk
php82-opcache 8.2.8-r0 apk
php82-openssl 8.2.8-r0 apk
php82-pdo 8.2.8-r0 apk
php82-pdo_mysql 8.2.8-r0 apk
php82-pdo_odbc 8.2.8-r0 apk
php82-pdo_pgsql 8.2.8-r0 apk
php82-pdo_sqlite 8.2.8-r0 apk
php82-pear 8.2.8-r0 apk
php82 8.2.10-r0 apk
php82-bcmath 8.2.10-r0 apk
php82-bz2 8.2.10-r0 apk
php82-common 8.2.10-r0 apk
php82-ctype 8.2.10-r0 apk
php82-curl 8.2.10-r0 apk
php82-dom 8.2.10-r0 apk
php82-exif 8.2.10-r0 apk
php82-fileinfo 8.2.10-r0 apk
php82-fpm 8.2.10-r0 apk
php82-ftp 8.2.10-r0 apk
php82-gd 8.2.10-r0 apk
php82-gmp 8.2.10-r0 apk
php82-iconv 8.2.10-r0 apk
php82-imap 8.2.10-r0 apk
php82-intl 8.2.10-r0 apk
php82-ldap 8.2.10-r0 apk
php82-mbstring 8.2.10-r0 apk
php82-mysqli 8.2.10-r0 apk
php82-mysqlnd 8.2.10-r0 apk
php82-opcache 8.2.10-r0 apk
php82-openssl 8.2.10-r0 apk
php82-pdo 8.2.10-r0 apk
php82-pdo_mysql 8.2.10-r0 apk
php82-pdo_odbc 8.2.10-r0 apk
php82-pdo_pgsql 8.2.10-r0 apk
php82-pdo_sqlite 8.2.10-r0 apk
php82-pear 8.2.10-r0 apk
php82-pecl-apcu 5.1.22-r0 apk
php82-pecl-igbinary 3.2.14-r0 apk
php82-pecl-mcrypt 1.0.6-r0 apk
php82-pecl-memcached 3.2.0-r1 apk
php82-pecl-msgpack 2.2.0-r0 apk
php82-pecl-redis 5.3.7-r2 apk
php82-pgsql 8.2.8-r0 apk
php82-phar 8.2.8-r0 apk
php82-posix 8.2.8-r0 apk
php82-session 8.2.8-r0 apk
php82-simplexml 8.2.8-r0 apk
php82-soap 8.2.8-r0 apk
php82-sockets 8.2.8-r0 apk
php82-sodium 8.2.8-r0 apk
php82-sqlite3 8.2.8-r0 apk
php82-tokenizer 8.2.8-r0 apk
php82-xml 8.2.8-r0 apk
php82-xmlreader 8.2.8-r0 apk
php82-xmlwriter 8.2.8-r0 apk
php82-xsl 8.2.8-r0 apk
php82-zip 8.2.8-r0 apk
php82-pecl-redis 6.0.0-r0 apk
php82-pgsql 8.2.10-r0 apk
php82-phar 8.2.10-r0 apk
php82-posix 8.2.10-r0 apk
php82-session 8.2.10-r0 apk
php82-simplexml 8.2.10-r0 apk
php82-soap 8.2.10-r0 apk
php82-sockets 8.2.10-r0 apk
php82-sodium 8.2.10-r0 apk
php82-sqlite3 8.2.10-r0 apk
php82-tokenizer 8.2.10-r0 apk
php82-xml 8.2.10-r0 apk
php82-xmlreader 8.2.10-r0 apk
php82-xmlwriter 8.2.10-r0 apk
php82-xsl 8.2.10-r0 apk
php82-zip 8.2.10-r0 apk
pinentry 1.2.1-r1 apk
pip 23.2.1 python
pkb-client 1.2 python
popt 1.19-r2 apk
portalocker 2.7.0 python
procps-ng 4.0.3-r1 apk
protobuf 4.24.2 python
portalocker 2.8.2 python
procps-ng 4.0.4-r0 apk
protobuf 4.24.3 python
publicsuffixlist 0.9.4 python
pyOpenSSL 23.2.0 python
pyRFC3339 1.1 python
@@ -302,28 +304,28 @@ pyparsing 3.1.1 python
python-dateutil 2.8.2 python
python-digitalocean 1.17.0 python
python-transip 0.6.0 python
python3 3.11.4-r0 apk
python3-pyc 3.11.4-r0 apk
python3-pycache-pyc0 3.11.4-r0 apk
pytz 2023.3 python
python3 3.11.5-r0 apk
python3-pyc 3.11.5-r0 apk
python3-pycache-pyc0 3.11.5-r0 apk
pytz 2023.3.post1 python
readline 8.2.1-r1 apk
requests 2.31.0 python
requests-file 1.5.1 python
requests-mock 1.11.0 python
rsa 4.9 python
s3transfer 0.6.2 python
s3transfer 0.7.0 python
scanelf 1.3.7-r1 apk
setuptools 65.5.0 python
shadow 4.13-r4 apk
six 1.16.0 python
skalibs 2.13.1.1-r1 apk
soupsieve 2.4.1 python
soupsieve 2.5 python
sqlite-libs 3.41.2-r2 apk
ssl_client 1.36.1-r2 apk
tiff 4.5.1-r0 apk
tldextract 3.4.4 python
tldextract 3.6.0 python
typing-inspect 0.9.0 python
typing_extensions 4.7.1 python
typing_extensions 4.8.0 python
tzdata 2023c-r1 apk
unixodbc 2.3.11-r2 apk
uritemplate 4.1.1 python
@@ -332,7 +334,7 @@ utmps-libs 0.1.2.1-r1 apk
wheel 0.41.2 python
whois 5.5.17-r0 apk
xz-libs 5.4.3-r0 apk
zipp 3.16.2 python
zipp 3.17.0 python
zlib 1.2.13-r1 apk
zope.interface 6.0 python
zstd-libs 1.5.5-r4 apk

View File

@@ -50,7 +50,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` 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 `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynu`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `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: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)." }
- { env_var: "ONLY_SUBDOMAINS", env_value: "false", desc: "If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`" }
@@ -153,6 +153,8 @@ app_setup_block: |
# changelog
changelogs:
- { date: "01.10.23:", desc: "Fix \"unrecognized arguments\" issue in DirectAdmin 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: "07.08.23:", desc: "Add Bunny DNS Configuration." }
- { date: "27.07.23:", desc: "Added support for dreamhost validation." }

View File

@@ -0,0 +1,4 @@
# Instructions: https://github.com/knoxell/certbot-dns-namecheap#credentials
# Namecheap API credentials used by Certbot
dns_namecheap_username=my-username
dns_namecheap_api_key=my-api-key

View File

@@ -304,7 +304,7 @@ if [[ "${VALIDATION}" = "dns" ]]; then
sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
fi
# plugins that use old parameter naming convention
if [[ "${DNSPLUGIN}" =~ ^(cpanel|directadmin)$ ]]; then
if [[ "${DNSPLUGIN}" =~ ^(cpanel)$ ]]; then
sed -i "/^dns-${DNSPLUGIN}-credentials\b/d" /config/etc/letsencrypt/cli.ini
sed -i "/^dns-${DNSPLUGIN}-propagation-seconds\b/d" /config/etc/letsencrypt/cli.ini
set_ini_value "authenticator" "${DNSPLUGIN}" /config/etc/letsencrypt/cli.ini