From: Benjamin Cama <benoar@free.fr>
Date: Thu, 26 Aug 2010 00:05:56 +0000 (+0000)
Subject: nginx: packaging enhancements * add a separate config menu for optionnal modules... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=53ad986972de178441c2483122d4e652f921ae95;p=openwrt%2Fsvn-archive%2Fpackages.git

nginx: packaging enhancements * add a separate config menu for optionnal modules (not every possible module are here; just taken the ones Debian enables). By default they are all disabled, so this removes the default dependency on libopenssl. * correctly listed conffiles * enable IPv6 only when CONFIG_IPV6 is set * change the default listening adress in nginx.conf when IPv6 is enabled so that it listens on [::]

SVN-Revision: 22807
---

diff --git a/net/nginx/Config.in b/net/nginx/Config.in
new file mode 100644
index 000000000..55bc482c1
--- /dev/null
+++ b/net/nginx/Config.in
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menu "Configuration"
+        depends on PACKAGE_nginx
+
+config NGINX_STUB_STATUS
+	bool
+	prompt "Enable stub status module"
+	default n
+	help
+		Enable the stub status module which gives some status from the server.
+
+config NGINX_FLV
+	bool
+	prompt "Enable FLV module"
+	default n
+	help
+		Provides the ability to seek within FLV (Flash) files using time-based offsets.
+
+config NGINX_SSL
+	bool
+	prompt "Enable SSL module"
+	default n
+	select PACKAGE_libopenssl
+	help
+		Enable HTTPS/SSL support.
+
+config NGINX_DAV
+	bool
+	prompt "Enable WebDAV module"
+	default n
+	help
+		Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
+
+endmenu
diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index ba2a88600..f7790d73f 100644
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -22,7 +22,8 @@ define Package/nginx
   CATEGORY:=Network
   TITLE:=Nginx web server
   URL:=http://nginx.net/
-  DEPENDS:=+libpcre +libopenssl
+  DEPENDS:=+libpcre
+  MENU:=1
 endef
 
 define Package/nginx/description
@@ -31,10 +32,41 @@ define Package/nginx/description
 	written by Igor Sysoev.
 endef
 
+define Package/nginx/config
+	source "$(SOURCE)/Config.in"
+endef
+
 config_files=nginx.conf mime.types fastcgi_params koi-utf koi-win win-utf
 
+define Package/nginx/conffiles
+/etc/nginx/nginx.conf
+/etc/nginx/mime.types
+/etc/nginx/fastcgi_params
+/etc/nginx/koi-utf
+/etc/nginx/koi-win
+/etc/nginx/win-utf
+endef
+
+ADDITIONAL_MODULES:=
+
+ifeq ($(CONFIG_IPV6),y)
+  ADDITIONAL_MODULES += --with-ipv6
+endif
+ifeq ($(CONFIG_NGINX_STUB_STATUS),y)
+  ADDITIONAL_MODULES += --with-http_stub_status_module
+endif
+ifeq ($(CONFIG_NGINX_FLV),y)
+  ADDITIONAL_MODULES += --with-http_flv_module
+endif
+ifeq ($(CONFIG_NGINX_SSL),y)
+  ADDITIONAL_MODULES += --with-http_ssl_module
+endif
+ifeq ($(CONFIG_NGINX_DAV),y)
+  ADDITIONAL_MODULES += --with-http_dav_module
+endif
+
 define Build/Configure
-	# fix --crossbuild
+	# TODO: fix --crossbuild
 	(cd $(PKG_BUILD_DIR) ;\
 		./configure \
 			--crossbuild=Linux::$(ARCH) \
@@ -50,9 +82,7 @@ define Build/Configure
 			--with-cc="$(TARGET_CC)" \
 			--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
 			--with-ld-opt="$(TARGET_LDFLAGS)" \
-			--with-http_stub_status_module \
-			--with-http_ssl_module \
-			--with-ipv6 )
+			$(ADDITIONAL_MODULES) )
 endef
 
 define Build/Compile
@@ -66,6 +96,10 @@ define Package/nginx/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/nginx
 	$(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx
+	# make nginx bind on both IPv4 and IPv6 by default, when available
+  ifeq ($(CONFIG_IPV6),y)
+	$(SED) 's/listen\( \+\)80;/listen\1[::]:80;/' $(1)/etc/nginx/nginx.conf
+  endif
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
 endef