85 lines
2.7 KiB
Text
85 lines
2.7 KiB
Text
--- conf/nginx.conf.orig 2008-02-28 22:44:16.000000000 +0200
|
|
+++ conf/nginx.conf
|
|
@@ -2,12 +2,11 @@
|
|
#user nobody;
|
|
worker_processes 1;
|
|
|
|
-#error_log logs/error.log;
|
|
-#error_log logs/error.log notice;
|
|
-#error_log logs/error.log info;
|
|
-
|
|
-#pid logs/nginx.pid;
|
|
+#error_log %%NGINX_LOGDIR%%/error.log;
|
|
+#error_log %%NGINX_LOGDIR%%/error.log notice;
|
|
+#error_log %%NGINX_LOGDIR%%/error.log info;
|
|
|
|
+#pid %%NGINX_LOGDIR%%/nginx.pid;
|
|
|
|
events {
|
|
worker_connections 1024;
|
|
@@ -15,14 +14,14 @@
|
|
|
|
|
|
http {
|
|
- include mime.types;
|
|
+ include %%PKG_SYSCONFDIR%%/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"';
|
|
|
|
- #access_log logs/access.log main;
|
|
+ #access_log %%NGINX_LOGDIR%%/access.log main;
|
|
|
|
sendfile on;
|
|
#tcp_nopush on;
|
|
@@ -38,10 +37,10 @@
|
|
|
|
#charset koi8-r;
|
|
|
|
- #access_log logs/host.access.log main;
|
|
+ #access_log %%NGINX_LOGDIR%%/host.access.log main;
|
|
|
|
location / {
|
|
- root html;
|
|
+ root share/examples/nginx/html;
|
|
index index.html index.htm;
|
|
}
|
|
|
|
@@ -51,7 +50,7 @@
|
|
#
|
|
error_page 500 502 503 504 /50x.html;
|
|
location = /50x.html {
|
|
- root html;
|
|
+ root share/examples/nginx/html;
|
|
}
|
|
|
|
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
|
|
@@ -67,7 +66,7 @@
|
|
# fastcgi_pass 127.0.0.1:9000;
|
|
# fastcgi_index index.php;
|
|
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
|
|
- # include fastcgi_params;
|
|
+ # include %%PKG_SYSCONFDIR%%/fastcgi_params;
|
|
#}
|
|
|
|
# deny access to .htaccess files, if Apache's document root
|
|
@@ -87,7 +86,7 @@
|
|
# server_name somename alias another.alias;
|
|
|
|
# location / {
|
|
- # root html;
|
|
+ # root share/examples/nginx/html;
|
|
# index index.html index.htm;
|
|
# }
|
|
#}
|
|
@@ -110,7 +109,7 @@
|
|
# ssl_prefer_server_ciphers on;
|
|
|
|
# location / {
|
|
- # root html;
|
|
+ # root share/examples/nginx/html;
|
|
# index index.html index.htm;
|
|
# }
|
|
#}
|