nginx: bump to 1.9.6

In this bump as agreed with Thomas we are dropping out all the nginx 3rd party
addons. In case you would like to see your 3rd party addon included please send
a pull request and make sure it works with newest version.

Signed-off-by: Luka Perkov <luka@openwrt.org>

3 files changed, 10 insertions, 116 deletions

diff --git a/net/nginx/files/nginx.init b/net/nginx/files/nginx.init
index adf36b442..d47d46f89 100644
--- a/net/nginx/files/nginx.init
+++ b/net/nginx/files/nginx.init
@@ -1,24 +1,17 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2012 OpenWrt.org
+# Copyright (C) 2015 OpenWrt.org
 
 START=50
-NGINX_BIN=/usr/sbin/nginx
 
-start() {
-	mkdir -p /var/log/nginx
-	mkdir -p /var/lib/nginx
-	$NGINX_BIN
-}
+USE_PROCD=1
 
-stop() {
-	$NGINX_BIN -s stop
-}
+start_service() {
+	[ -d /var/log/nginx ] || mkdir -p /var/log/nginx
+	[ -d /var/lib/nginx ] || mkdir -p /var/lib/nginx
 
-reload() {
-	$NGINX_BIN -s reload
+	procd_open_instance
+	procd_set_param command /usr/sbin/nginx -c /etc/nginx/nginx.conf -g 'daemon off;'
+	procd_set_param file /etc/nginx/nginx.conf
+	procd_set_param respawn
+	procd_close_instance
 }
-
-shutdown() {
-	$NGINX_BIN -s quit
-}
-
diff --git a/net/nginx/files/nginx.proxyprotocol.example b/net/nginx/files/nginx.proxyprotocol.example
deleted file mode 100644
index ab4bad625..000000000
--- a/net/nginx/files/nginx.proxyprotocol.example
+++ /dev/null
@@ -1,40 +0,0 @@
-worker_processes  1;
-pid /tmp/nginx.pid;
-daemon off;
-master_process off;
-error_log stderr debug_core;
-
-events {
- debug_connection <YOUR IPv4>;
- debug_connection <YOUR IPV6>;
- worker_connections  1024;
-}
-
-http {
- default_type  application/octet-stream;
- client_body_temp_path /tmp/body 1;
-
- access_log /tmp/nginx_access.log;
-
- server {
-#  listen       8082 ssl;
-# proxy protocol configuration for nginx 1.4.x:
-  listen       8082 accept_proxy_protocol=on;
-# same with spdy enabled:
-#  listen       8082 spdy ssl accept_proxy_protocol=on;
-  listen       [::]:8082 ipv6only=on;
-  ssl_certificate /your/certificate;
-  ssl_certificate_key /your/key;
-  server_name  localhost;
-# proxy protocol configuration for nginx 1.2.x:
-#  accept_proxy_protocol on;
- 
-  location / {
-   proxy_pass        http://127.0.0.1:8084;
-   proxy_set_header  X-Real-IP  $remote_addr;
-   proxy_connect_timeout 10s;
-   proxy_read_timeout 10s;
-   send_proxy_protocol on;
-  }
- }
-}
diff --git a/net/nginx/files/nginx.syslog.example b/net/nginx/files/nginx.syslog.example
deleted file mode 100644
index 05943448d..000000000
--- a/net/nginx/files/nginx.syslog.example
+++ /dev/null
@@ -1,59 +0,0 @@
-worker_processes  1;
-
-syslog local6 nginx;
-
-events {
-        worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] $request '
-        '"$status" $body_bytes_sent "$http_referer" '
-        '"$http_user_agent" "$http_x_forwarded_for"';
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        #send the log to syslog and file.
-        access_log  syslog:notice|logs/host1.access.log main;
-
-        # pre 1.5.x
-        error_log syslog:notice|logs/host1.error.log;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-    }
-
-    server {
-        listen       80;
-        server_name  www.example.com;
-
-        access_log  syslog:warn|logs/host2.access.log main;
-        error_log syslog:warn|logs/host2.error.log;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-    }
-
-    server {
-        listen       80;
-        server_name  www.test.com;
-
-        #send the log just to syslog.
-        access_log  syslog:error main;
-        error_log syslog:error;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-    }
-}