diff --git a/net/acme/Makefile b/net/acme/Makefile index 42d1026da..5f0dc0f84 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme PKG_VERSION:=2.7.9 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPLv3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -75,7 +75,7 @@ define Package/luci-app-acme SECTION:=luci CATEGORY:=LuCI TITLE:=ACME package - LuCI interface - DEPENDS:= lua luci-base +acme + DEPENDS:= lua luci-base +acme SUBMENU:=3. Applications endef diff --git a/net/acme/files/acme-cbi.lua b/net/acme/files/acme-cbi.lua index 5c483491e..2b9727217 100644 --- a/net/acme/files/acme-cbi.lua +++ b/net/acme/files/acme-cbi.lua @@ -61,7 +61,7 @@ kl.datatype = "and(uinteger,min(2048))" if uhttpd_presence then u = cs:option(Flag, "update_uhttpd", translate("Use for uhttpd"), translate("Update the uhttpd config with this certificate once issued " .. - "(only select this for one certificate)." .. + "(only select this for one certificate)." .. "Is also available luci-app-uhttpd to configure uhttpd form the LuCI interface.")) u.rmempty = false end @@ -69,8 +69,9 @@ end if nginx_presence then u = cs:option(Flag, "update_nginx", translate("Use for nginx"), translate("Update the nginx config with this certificate once issued " .. - "(only select this for one certificate)." .. - "Nginx must support ssl, if not it won't start as it needs to be compiled with ssl support to use cert options")) + "(only select this for one certificate)." .. + "Nginx must support ssl, if not it won't start as it needs to be " .. + "compiled with ssl support to use cert options")) u.rmempty = false end diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh index 506c19a63..a0a9a784c 100644 --- a/net/acme/files/run.sh +++ b/net/acme/files/run.sh @@ -67,19 +67,19 @@ pre_checks() for listener in $(get_listeners); do pid="${listener%/*}" cmd="${listener#*/}" - + case "$cmd" in uhttpd) debug "Found uhttpd listening on port 80; trying to disable." - + UHTTPD_LISTEN_HTTP=$(uci get uhttpd.main.listen_http) - + if [ -z "$UHTTPD_LISTEN_HTTP" ]; then err "$main_domain: Unable to find uhttpd listen config." err "Manually disable uhttpd or set webroot to continue." return 1 fi - + uci set uhttpd.main.listen_http='' uci commit uhttpd || return 1 if ! /etc/init.d/uhttpd reload ; then @@ -189,7 +189,7 @@ issue_cert() config_get keylength "$section" keylength config_get webroot "$section" webroot config_get dns "$section" dns - + UPDATE_NGINX=$update_nginx UPDATE_UHTTPD=$update_uhttpd