From 279c09d0b24f72a7751620edd915da1868adb6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Thu, 23 May 2019 16:46:29 +0200 Subject: [PATCH] ACME: Remove dependency on luci-lib-ipkg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- net/acme/Makefile | 2 +- net/acme/files/acme-cbi.lua | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index 412e7019c..0274e28f7 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:=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 cb469b9d6..5fc860e32 100644 --- 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 ]]-- -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. " ..