Marcus Rueckert
19316524bd
- update to 1.10.1 (bsc# 982505)
Security: a segmentation fault might occur in a worker process
while writing a specially crafted request body to a temporary
file (CVE-2016-4450); the bug had appeared in 1.3.9.
- improve conditionals
- merge the 12.2 and 12.1 based conditionals into 1 as both of
them are out of support now.
- enable pcre JIT
- make use if libatomic_ops on Leap
- enable dynamic modules for intree modules. The following modules
are built as loadable modules now:
ngx_http_geoip_module.so
ngx_http_image_filter_module.so
ngx_http_perl_module.so
ngx_http_xslt_filter_module.so
ngx_mail_module.so
ngx_stream_module.so
You will have to load those modules with load_module.
http://nginx.org/en/docs/ngx_core_module.html#load_module
The correct syntax for this package is:
# For 64bit machines:
load_module lib64/nginx/modules/ngx_http_geoip_module.so;
# For 32bit machines:
load_module lib/nginx/modules/ngx_http_geoip_module.so;
Examples for all the intree modules have been added to the
default nginx.conf
- patches updated:
nginx-1.6.1-default_config.patch - added load_module example
OBS-URL: https://build.opensuse.org/request/show/399481
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=64
105 lines
2.8 KiB
Diff
105 lines
2.8 KiB
Diff
Index: conf/nginx.conf
|
|
===================================================================
|
|
--- conf/nginx.conf.orig
|
|
+++ conf/nginx.conf
|
|
@@ -1,16 +1,24 @@
|
|
|
|
-#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_geoip_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_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 +30,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 +40,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 +61,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 +73,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 +97,7 @@ http {
|
|
# server_name somename alias another.alias;
|
|
|
|
# location / {
|
|
- # root html;
|
|
+ # root /srv/www/htdocs/;
|
|
# index index.html index.htm;
|
|
# }
|
|
#}
|
|
@@ -109,9 +119,11 @@ http {
|
|
# ssl_prefer_server_ciphers on;
|
|
|
|
# location / {
|
|
- # root html;
|
|
+ # root /srv/www/htdocs/;
|
|
# index index.html index.htm;
|
|
# }
|
|
#}
|
|
|
|
+ include vhosts.d/*.conf;
|
|
+
|
|
}
|