Marcus Rueckert
4b0afe6fe8
- update nginx-1.6.1-default_config.patch: * remove geoip_module which is no longer compiled (bsc#1156202) OBS-URL: https://build.opensuse.org/request/show/824381 OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=174
118 lines
3.3 KiB
Diff
118 lines
3.3 KiB
Diff
Index: conf/nginx.conf
|
|
===================================================================
|
|
--- conf/nginx.conf.orig
|
|
+++ conf/nginx.conf
|
|
@@ -1,16 +1,26 @@
|
|
|
|
-#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_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_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 +32,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 +42,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 +63,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 +75,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 +99,7 @@ http {
|
|
# server_name somename alias another.alias;
|
|
|
|
# location / {
|
|
- # root html;
|
|
+ # root /srv/www/htdocs/;
|
|
# index index.html index.htm;
|
|
# }
|
|
#}
|
|
@@ -102,6 +114,10 @@ http {
|
|
# ssl_certificate cert.pem;
|
|
# ssl_certificate_key cert.key;
|
|
|
|
+ # Allow TLS version 1.2 only, which is a recommended default these days
|
|
+ # by international information security standards.
|
|
+ # ssl_protocols TLSv1.2;
|
|
+
|
|
# ssl_session_cache shared:SSL:1m;
|
|
# ssl_session_timeout 5m;
|
|
|
|
@@ -109,9 +125,11 @@ http {
|
|
# ssl_prefer_server_ciphers on;
|
|
|
|
# location / {
|
|
- # root html;
|
|
+ # root /srv/www/htdocs/;
|
|
# index index.html index.htm;
|
|
# }
|
|
#}
|
|
|
|
+ include vhosts.d/*.conf;
|
|
+
|
|
}
|