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

Merge pull request #1939 from Ansuel/luci-nginx

Browse source 
luci-nginx: fix nginx dependency
This commit is contained in:
Hannu Nyman 2018-07-06 18:42:02 +03:00 committed by GitHub
commit 885f993593
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
collections/luci-ssl-nginx/Makefile
View file

@ -9,8 +9,14 @@ include $(TOPDIR)/rules.mk
LUCI_TYPE:=col
LUCI_BASENAME:=ssl
LUCI_TITLE:=LuCI with HTTPS support (mbedTLS as SSL backend)
LUCI_DEPENDS:=+luci-nginx +nginx-mod-luci-ssl +libustream-mbedtls +px5g
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-proto-ppp +libiwinfo-lua +IPV6:luci-proto-ipv6 \
+rpcd-mod-rrdns +libustream-openssl +openssl-util
PKG_LICENSE:=Apache-2.0

21
collections/luci-ssl-openssl-nginx/Makefile
View file

@ -1,21 +0,0 @@
#
# Copyright (C) 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-openssl
LUCI_TITLE:=LuCI with HTTPS support (OpenSSL as SSL backend)
LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \
OpenSSL cmd tools (openssl-util) are used by uhttpd for SSL key generation \
instead of the default px5g. (If px5g is installed, uhttpd will prefer that.)
LUCI_DEPENDS:=+luci-nginx +nginx-mod-luci-ssl +libustream-openssl +openssl-util
include ../../luci.mk
# call BuildPackage - OpenWrt buildroot signature