diff options
| -rw-r--r-- | usr.sbin/nginx/Makefile.bsd-wrapper | 14 | ||||
| -rw-r--r-- | usr.sbin/nginx/conf/nginx.conf | 10 |
2 files changed, 18 insertions, 6 deletions
diff --git a/usr.sbin/nginx/Makefile.bsd-wrapper b/usr.sbin/nginx/Makefile.bsd-wrapper index 6b90d90ba95..2a8cabb4b75 100644 --- a/usr.sbin/nginx/Makefile.bsd-wrapper +++ b/usr.sbin/nginx/Makefile.bsd-wrapper @@ -1,5 +1,5 @@ # Build wrapper for Nginx -# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2011/10/05 18:04:18 robert Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2012/02/19 11:29:37 robert Exp $ LNDIR= /usr/bin/lndir @@ -75,6 +75,18 @@ lint: tags: # Nothing here so far... +distribution: + ${INSTALL} -C -o root -g wheel -m 0644 \ + ${.CURDIR}/conf/fastcgi_params \ + ${.CURDIR}/conf/koi-utf \ + ${.CURDIR}/conf/koi-win \ + ${.CURDIR}/conf/mime.types \ + ${.CURDIR}/conf/nginx.conf \ + ${.CURDIR}/conf/scgi_params \ + ${.CURDIR}/conf/uwsgi_params \ + ${.CURDIR}/conf/win-utf \ + ${DESTDIR}/etc/nginx/ + .ifdef NOMAN maninstall: @echo NOMAN is set diff --git a/usr.sbin/nginx/conf/nginx.conf b/usr.sbin/nginx/conf/nginx.conf index 3bb3389365f..62b6ecc05cf 100644 --- a/usr.sbin/nginx/conf/nginx.conf +++ b/usr.sbin/nginx/conf/nginx.conf @@ -41,7 +41,7 @@ http { #access_log logs/host.access.log main; location / { - root html; + root /htdocs; index index.html index.htm; } @@ -51,7 +51,7 @@ http { # error_page 500 502 503 504 /50x.html; location = /50x.html { - root html; + root /htdocs; } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 @@ -63,7 +63,7 @@ http { # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # #location ~ \.php$ { - # root html; + # root /htdocs; # fastcgi_pass 127.0.0.1:9000; # fastcgi_index index.php; # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; @@ -87,7 +87,7 @@ http { # server_name somename alias another.alias; # location / { - # root html; + # root /htdocs; # index index.html index.htm; # } #} @@ -110,7 +110,7 @@ http { # ssl_prefer_server_ciphers on; # location / { - # root html; + # root /htdocs; # index index.html index.htm; # } #} |