mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

axe --sysconfdir=PATH

Browse Source 
configuration prefix is dirname of --conf-path=PATH
fix paths in default nginx.conf
This commit is contained in:
Igor Sysoev 2007-08-14 19:26:20 +00:00
parent 1dc136cc12
commit 5cf4d1af4e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
auto/options
View File

@ -124,7 +124,6 @@ do
--prefix=*) NGX_PREFIX="$value" ;; --prefix=*) NGX_PREFIX="$value" ;;
--sbin-path=*) NGX_SBIN_PATH="$value" ;; --sbin-path=*) NGX_SBIN_PATH="$value" ;;
--sysconfdir=*) NGX_CONF_PREFIX="$value" ;;
--conf-path=*) NGX_CONF_PATH="$value" ;; --conf-path=*) NGX_CONF_PATH="$value" ;;
--error-log-path=*) NGX_ERROR_LOG_PATH="$value";; --error-log-path=*) NGX_ERROR_LOG_PATH="$value";;
--pid-path=*) NGX_PID_PATH="$value" ;; --pid-path=*) NGX_PID_PATH="$value" ;;
@ -242,7 +241,6 @@ cat << END
--prefix=PATH set the installation prefix --prefix=PATH set the installation prefix
--sbin-path=PATH set path to the nginx binary file --sbin-path=PATH set path to the nginx binary file
--sysconfdir=PATH set the configuration prefix
--conf-path=PATH set path to the nginx.conf file --conf-path=PATH set path to the nginx.conf file
--error-log-path=PATH set path to the error log --error-log-path=PATH set path to the error log
--pid-path=PATH set path to nginx.pid file --pid-path=PATH set path to nginx.pid file
@ -363,7 +361,6 @@ fi
NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx} NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx}
NGX_CONF_PREFIX=${NGX_CONF_PREFIX:-$NGX_PREFIX}
case ".$NGX_SBIN_PATH" in case ".$NGX_SBIN_PATH" in
@ -385,15 +382,18 @@ case ".$NGX_CONF_PATH" in
;; ;;
.) .)
NGX_CONF_PATH=$NGX_CONF_PREFIX/conf/nginx.conf NGX_CONF_PATH=$NGX_PREFIX/conf/nginx.conf
;; ;;
*) *)
NGX_CONF_PATH=$NGX_CONF_PREFIX/$NGX_CONF_PATH NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH
;; ;;
esac esac
NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
case ".$NGX_PID_PATH" in case ".$NGX_PID_PATH" in
./*) ./*)
;; ;;

4
conf/nginx.conf
View File

@ -15,7 +15,7 @@ events {
http { http {
include conf/mime.types; include mime.types;
default_type application/octet-stream; default_type application/octet-stream;
#log_format main '$remote_addr - $remote_user [$time_local] $request ' #log_format main '$remote_addr - $remote_user [$time_local] $request '
@ -66,7 +66,7 @@ http {
# fastcgi_pass 127.0.0.1:9000; # fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php; # fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
# include conf/fastcgi_params; # include fastcgi_params;
#} #}
# deny access to .htaccess files, if Apache's document root # deny access to .htaccess files, if Apache's document root