nginx/nginx-1.6.1-default_config.patch
Marguerite Su daf9eab557 Accepting request 449045 from home:darix:playground
- update to 1.11.8
- update headers-more-nginx-module 0.32
- update nginx-rtmp-module 1.1.10
- update patches to apply cleanly again

OBS-URL: https://build.opensuse.org/request/show/449045
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=74
2017-01-07 08:16:09 +00:00

109 lines
3.0 KiB
Diff

Index: conf/nginx.conf
===================================================================
--- conf/nginx.conf.orig
+++ conf/nginx.conf
@@ -1,16 +1,28 @@
-#user nobody;
+#user nginx;
worker_processes 1;
-#error_log logs/error.log;
-#error_log logs/error.log notice;
-#error_log logs/error.log info;
+# load_module #LIBDIR#/nginx/modules/ngx_http_fancyindex_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_http_geoip_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_http_headers_more_filter_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_http_image_filter_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_http_perl_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_http_xslt_filter_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_mail_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_rtmp_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_stream_geoip_module.so;
+# load_module #LIBDIR#/nginx/modules/ngx_stream_module.so;
+
+#error_log /var/log/nginx/error.log;
+#error_log /var/log/nginx/error.log notice;
+#error_log /var/log/nginx/error.log info;
-#pid logs/nginx.pid;
+#pid /var/run/nginx.pid;
events {
worker_connections 1024;
+ use epoll;
}
@@ -22,7 +34,7 @@ http {
# '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';
- #access_log logs/access.log main;
+ #access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
@@ -32,16 +44,18 @@ http {
#gzip on;
+ include conf.d/*.conf;
+
server {
listen 80;
server_name localhost;
#charset koi8-r;
- #access_log logs/host.access.log main;
+ #access_log /var/log/nginx/host.access.log main;
location / {
- root html;
+ root /srv/www/htdocs/;
index index.html index.htm;
}
@@ -51,7 +65,7 @@ http {
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
- root html;
+ root /srv/www/htdocs/;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
@@ -63,7 +77,7 @@ http {
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
- # root html;
+ # root /srv/www/htdocs/;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
@@ -87,7 +101,7 @@ http {
# server_name somename alias another.alias;
# location / {
- # root html;
+ # root /srv/www/htdocs/;
# index index.html index.htm;
# }
#}
@@ -109,9 +123,11 @@ http {
# ssl_prefer_server_ciphers on;
# location / {
- # root html;
+ # root /srv/www/htdocs/;
# index index.html index.htm;
# }
#}
+ include vhosts.d/*.conf;
+
}