diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2024-04-20 23:36:28 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2024-04-20 23:36:28 +0200 |
| commit | 218bdbb89c1848147b838949a2c6315fddb056ea (patch) | |
| tree | 1fce04743b66c4316e8b914812b30610b58b2c42 /collections | |
| parent | ea04003657cc06ee69639aaede24b4c74071946c (diff) | |
collections: drop luci-ssl-nginx
Since upstream commit
https://github.com/openwrt/packages/commit/f5d7a26531aa0e6fdade9836dfef3450fb007b01
it is not possible to ship non-ssl nginx flavors anymore.
Drop the luci-ssl-nginx collection, retain just luci-nginx and let it provide
a virtual luci-ssl-nginx package for backwards compatibility.
Fixes: #7024
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'collections')
| -rw-r--r-- | collections/luci-nginx/Makefile | 1 | ||||
| -rw-r--r-- | collections/luci-ssl-nginx/Makefile | 25 |
2 files changed, 1 insertions, 25 deletions
diff --git a/collections/luci-nginx/Makefile b/collections/luci-nginx/Makefile index 1b3b5356b4..cbdb8261cb 100644 --- a/collections/luci-nginx/Makefile +++ b/collections/luci-nginx/Makefile @@ -17,6 +17,7 @@ LUCI_DEPENDS:= \ +rpcd-mod-rrdns PKG_LICENSE:=Apache-2.0 +PKG_PROVIDES:=luci-ssl-nginx include ../../luci.mk diff --git a/collections/luci-ssl-nginx/Makefile b/collections/luci-ssl-nginx/Makefile deleted file mode 100644 index 0289ac8001..0000000000 --- a/collections/luci-ssl-nginx/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) 2008-2016 The LuCI Team -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TYPE:=col -LUCI_BASENAME:=ssl - -LUCI_TITLE:=LuCI with HTTPS support on Nginx (OpenSSL as SSL backend) -LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \ - OpenSSL cmd tools (openssl-util) are used by nginx for SSL key generation. \ - -LUCI_DEPENDS:= \ - +nginx-ssl +nginx-mod-luci-ssl +luci-mod-admin-full +luci-theme-bootstrap \ - +luci-app-firewall +luci-app-opkg +luci-proto-ppp +IPV6:luci-proto-ipv6 \ - +rpcd-mod-rrdns +openssl-util - -PKG_LICENSE:=Apache-2.0 - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature |