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

ACME: Remove dependency on luci-lib-ipkg

Browse source 
Instead, use @jow-'s suggestion of just checking for the presence of the
executables to find the installed web servers.

Fixes #8529.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
This commit is contained in:
Toke Høiland-Jørgensen 2019-05-23 16:46:29 +02:00
parent 5765c130ea
commit 279c09d0b2
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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:=8 PKG_RELEASE:=9
PKG_LICENSE:=GPLv3 PKG_LICENSE:=GPLv3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

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

@ -10,11 +10,10 @@ Copyright 2016 Toke Høiland-Jørgensen <toke@toke.dk>
]]-- ]]--
local ipkg = require "luci.model.ipkg" local fs = require "nixio.fs"
local nginx_presence = ipkg.installed("nginx-all-module") or ipkg.installed("nginx-ssl") or false local nginx_presence = fs.access("/usr/sbin/nginx") or false
local uhttpd_presence = fs.access("/usr/sbin/uhttpd") or false
local uhttpd_presence = ipkg.installed("uhttpd") or false
m = Map("acme", translate("ACME certificates"), m = Map("acme", translate("ACME certificates"),
translate("This configures ACME (Letsencrypt) automatic certificate installation. " .. translate("This configures ACME (Letsencrypt) automatic certificate installation. " ..