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

acme: Fix whitespace and long lines, bump package rev

Browse source 
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
This commit is contained in:
Toke Høiland-Jørgensen 2018-09-19 16:29:55 +02:00
parent 924e2f53e2
commit a96c90b6f5
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/acme/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=acme PKG_NAME:=acme
PKG_VERSION:=2.7.9 PKG_VERSION:=2.7.9
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=GPLv3 PKG_LICENSE:=GPLv3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -75,7 +75,7 @@ define Package/luci-app-acme
SECTION:=luci SECTION:=luci
CATEGORY:=LuCI CATEGORY:=LuCI
TITLE:=ACME package - LuCI interface TITLE:=ACME package - LuCI interface
DEPENDS:= lua luci-base +acme DEPENDS:= lua luci-base +acme
SUBMENU:=3. Applications SUBMENU:=3. Applications
endef endef

7
net/acme/files/acme-cbi.lua
View file

@ -61,7 +61,7 @@ kl.datatype = "and(uinteger,min(2048))"
if uhttpd_presence then if uhttpd_presence then
u = cs:option(Flag, "update_uhttpd", translate("Use for uhttpd"), u = cs:option(Flag, "update_uhttpd", translate("Use for uhttpd"),
translate("Update the uhttpd config with this certificate once issued " .. 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.")) "Is also available luci-app-uhttpd to configure uhttpd form the LuCI interface."))
u.rmempty = false u.rmempty = false
end end
@ -69,8 +69,9 @@ end
if nginx_presence then if nginx_presence then
u = cs:option(Flag, "update_nginx", translate("Use for nginx"), u = cs:option(Flag, "update_nginx", translate("Use for nginx"),
translate("Update the nginx config with this certificate once issued " .. translate("Update the nginx config with this certificate once issued " ..
"(only select this for one certificate)." .. "(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")) "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 u.rmempty = false
end end

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

@ -67,19 +67,19 @@ pre_checks()
for listener in $(get_listeners); do for listener in $(get_listeners); do
pid="${listener%/*}" pid="${listener%/*}"
cmd="${listener#*/}" cmd="${listener#*/}"
case "$cmd" in case "$cmd" in
uhttpd) uhttpd)
debug "Found uhttpd listening on port 80; trying to disable." debug "Found uhttpd listening on port 80; trying to disable."
UHTTPD_LISTEN_HTTP=$(uci get uhttpd.main.listen_http) UHTTPD_LISTEN_HTTP=$(uci get uhttpd.main.listen_http)
if [ -z "$UHTTPD_LISTEN_HTTP" ]; then if [ -z "$UHTTPD_LISTEN_HTTP" ]; then
err "$main_domain: Unable to find uhttpd listen config." err "$main_domain: Unable to find uhttpd listen config."
err "Manually disable uhttpd or set webroot to continue." err "Manually disable uhttpd or set webroot to continue."
return 1 return 1
fi fi
uci set uhttpd.main.listen_http='' uci set uhttpd.main.listen_http=''
uci commit uhttpd || return 1 uci commit uhttpd || return 1
if ! /etc/init.d/uhttpd reload ; then if ! /etc/init.d/uhttpd reload ; then
@ -189,7 +189,7 @@ issue_cert()
config_get keylength "$section" keylength config_get keylength "$section" keylength
config_get webroot "$section" webroot config_get webroot "$section" webroot
config_get dns "$section" dns config_get dns "$section" dns
UPDATE_NGINX=$update_nginx UPDATE_NGINX=$update_nginx
UPDATE_UHTTPD=$update_uhttpd UPDATE_UHTTPD=$update_uhttpd