Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12121 from 4wrxb/acme_dns_calias

Browse source 
acme: Update acme.sh URL, add support for challenge & domain alises.
This commit is contained in:
Toke Høiland-Jørgensen 2020-05-11 11:47:48 +02:00 committed by GitHub
commit 59b91fc342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/acme/Makefile
View file

@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=acme
PKG_VERSION:=2.8.6
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/Neilpang/acme.sh/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=https://github.com/acmesh-official/acme.sh/archive/$(PKG_VERSION).tar.gz
PKG_HASH:=fd36cb749466296ded521ceacda3fc841ec76be620900d1116e0492d171c1d9f
PKG_BUILD_DIR:=$(BUILD_DIR)/acme.sh-$(PKG_VERSION)

21
net/acme/files/acme.config
View file

@ -3,14 +3,31 @@ config acme
option account_email 'email@example.org'
option debug 0
config cert 'example_wildcard'
option enabled 0
option use_staging 1
option keylength 2048
option update_uhttpd 1
option update_nginx 1
list domains example.org
list domains sub.example.org
list domains *.sub.example.org
# option user_setup "path-to-custom-setup.script"
# option user_cleanup "path-to-custom-cleanup.script"
option dns "dns_freedns"
list credentials 'FREEDNS_User="ssladmin@example.org"'
list credentials 'FREEDNS_Password="1234"'
option calias "example.com"
option dalias "dalias.example.com"
config cert 'example'
option enabled 0
option use_staging 1
option keylength 2048
option update_uhttpd 1
option update_nginx 1
list domains example.org
list domains sub.example.org
option webroot ""
option dns ""
# option user_setup "path-to-custom-setup.script"
# option user_cleanup "path-to-custom-cleanup.script"
list domains example.org

12
net/acme/files/run.sh
View file

@ -205,6 +205,8 @@ issue_cert()
config_get_bool use_staging "$section" use_staging
config_get_bool update_uhttpd "$section" update_uhttpd
config_get_bool update_nginx "$section" update_nginx
config_get calias "$section" calias
config_get dalias "$section" dalias
config_get domains "$section" domains
config_get keylength "$section" keylength
config_get webroot "$section" webroot
@ -268,6 +270,16 @@ issue_cert()
if [ -n "$dns" ]; then
log "Using dns mode"
acme_args="$acme_args --dns $dns"
if [ -n "$dalias" ]; then
log "Using domain alias for dns mode"
acme_args="$acme_args --domain-alias $dalias"
if [ -n "$calias" ]; then
err "Both domain and challenge aliases are defined. Ignoring the challenge alias."
fi
elif [ -n "$calias" ]; then
log "Using challenge alias for dns mode"
acme_args="$acme_args --challenge-alias $calias"
fi
elif [ -z "$webroot" ]; then
log "Using standalone mode"
acme_args="$acme_args --standalone --listen-v6"