diff options
| -rw-r--r-- | auto/options | 10 | ||||
| -rw-r--r-- | conf/nginx.conf | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/auto/options b/auto/options index 0640f8c84..a9d7a2ae4 100644 --- a/auto/options +++ b/auto/options @@ -124,7 +124,6 @@ do --prefix=*) NGX_PREFIX="$value" ;; --sbin-path=*) NGX_SBIN_PATH="$value" ;; - --sysconfdir=*) NGX_CONF_PREFIX="$value" ;; --conf-path=*) NGX_CONF_PATH="$value" ;; --error-log-path=*) NGX_ERROR_LOG_PATH="$value";; --pid-path=*) NGX_PID_PATH="$value" ;; @@ -242,7 +241,6 @@ cat << END --prefix=PATH set the installation prefix --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 --error-log-path=PATH set path to the error log --pid-path=PATH set path to nginx.pid file @@ -363,7 +361,6 @@ fi NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx} -NGX_CONF_PREFIX=${NGX_CONF_PREFIX:-$NGX_PREFIX} 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 +NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH` + + case ".$NGX_PID_PATH" in ./*) ;; diff --git a/conf/nginx.conf b/conf/nginx.conf index 1edd0a63c..75dad9342 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -15,7 +15,7 @@ events { http { - include conf/mime.types; + include mime.types; default_type application/octet-stream; #log_format main '$remote_addr - $remote_user [$time_local] $request ' @@ -66,7 +66,7 @@ http { # fastcgi_pass 127.0.0.1:9000; # fastcgi_index index.php; # 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 |