ACME: Remove dependency on luci-lib-ipkg

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>

diff --git a/net/acme/Makefile b/net/acme/Makefile
index 412e7019c0d3cf80eb52df442dcd032a9388c420..0274e28f7fee34339e5bf86b5e01914bb3e3dcb9 100644 (file)
--- 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:=8
+PKG_RELEASE:=9
 PKG_LICENSE:=GPLv3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/net/acme/files/acme-cbi.lua b/net/acme/files/acme-cbi.lua
index cb469b9d6cb9c995a43038c2b18003b052fb96a4..5fc860e3218ca1848b1503b127ca9b7a5ac61124 100644 (file)
--- a/net/acme/files/acme-cbi.lua
+++ b/net/acme/files/acme-cbi.lua
@@ -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 uhttpd_presence = ipkg.installed("uhttpd") or false
+local nginx_presence = fs.access("/usr/sbin/nginx") or false
+local uhttpd_presence = fs.access("/usr/sbin/uhttpd") or false
 
 m = Map("acme", translate("ACME certificates"),
        translate("This configures ACME (Letsencrypt) automatic certificate installation. " ..