summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2012-10-28 16:00:56 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2012-10-28 16:00:56 +0000
commit8684023064f437d440166d4a20127826e416d821 (patch)
tree375a6fc6da877488d5821037c0e49acf1ab17feb
parent7ba33d04c380e4125120fa5a4aacf30513920f85 (diff)
rework the default config a bit to work with php-fpm out of the box
-rw-r--r--usr.sbin/nginx/conf/nginx.conf15
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/nginx/conf/nginx.conf b/usr.sbin/nginx/conf/nginx.conf
index 22d507312fa..87a4b303a06 100644
--- a/usr.sbin/nginx/conf/nginx.conf
+++ b/usr.sbin/nginx/conf/nginx.conf
@@ -1,5 +1,4 @@
-
-#user nobody;
+#user www;
worker_processes 1;
#error_log logs/error.log;
@@ -44,7 +43,7 @@ http {
#access_log logs/host.access.log main;
location / {
- root /htdocs;
+ root /var/www/htdocs;
index index.html index.htm;
}
@@ -54,7 +53,7 @@ http {
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
- root /htdocs;
+ root /var/www/htdocs;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
@@ -66,10 +65,10 @@ http {
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
#location ~ \.php$ {
- # root /htdocs;
+ # root /var/www/htdocs;
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
- # fastcgi_param SCRIPT_FILENAME /htdocs$fastcgi_script_name;
+ # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
# include fastcgi_params;
#}
@@ -90,7 +89,7 @@ http {
# server_name somename alias another.alias;
# location / {
- # root /htdocs;
+ # root /var/www/htdocs;
# index index.html index.htm;
# }
#}
@@ -113,7 +112,7 @@ http {
# ssl_prefer_server_ciphers on;
# location / {
- # root /htdocs;
+ # root /var/www/htdocs;
# index index.html index.htm;
# }
#}