2004-10-21 19:54:45 +02:00
|
|
|
|
|
|
|
$FreeBSD$
|
|
|
|
|
2007-06-14 12:32:32 +02:00
|
|
|
--- conf/nginx.conf.orig Thu Jan 18 10:08:18 2007
|
|
|
|
+++ conf/nginx.conf Thu Jun 14 12:57:52 2007
|
2005-11-15 13:59:44 +01:00
|
|
|
@@ -15,7 +15,7 @@
|
2004-10-21 19:54:45 +02:00
|
|
|
|
|
|
|
|
|
|
|
http {
|
|
|
|
- include conf/mime.types;
|
|
|
|
+ include mime.types;
|
|
|
|
default_type application/octet-stream;
|
|
|
|
|
2005-11-15 13:59:44 +01:00
|
|
|
#log_format main '$remote_addr - $remote_user [$time_gmt] $status '
|
|
|
|
@@ -33,7 +33,7 @@
|
2004-10-21 19:54:45 +02:00
|
|
|
#gzip on;
|
|
|
|
|
|
|
|
server {
|
2005-11-15 13:59:44 +01:00
|
|
|
- listen 80;
|
|
|
|
+ listen %%HTTP_PORT%%;
|
|
|
|
server_name localhost;
|
2004-10-21 19:54:45 +02:00
|
|
|
|
2005-11-15 13:59:44 +01:00
|
|
|
#charset koi8-r;
|
|
|
|
@@ -41,7 +41,7 @@
|
|
|
|
#access_log logs/host.access.log main;
|
2004-10-21 19:54:45 +02:00
|
|
|
|
|
|
|
location / {
|
|
|
|
- root html;
|
|
|
|
+ root %%PREFIX%%/www/nginx;
|
|
|
|
index index.html index.htm;
|
|
|
|
}
|
|
|
|
|
2007-06-14 12:32:32 +02:00
|
|
|
@@ -51,7 +51,7 @@
|
|
|
|
#
|
|
|
|
error_page 500 502 503 504 /50x.html;
|
|
|
|
location = /50x.html {
|
|
|
|
- root html;
|
|
|
|
+ root %%PREFIX%%/www/nginx-dist;
|
|
|
|
}
|
|
|
|
|
|
|
|
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
|