Mercurial > hg > nginx

comparison auto/options @ 1394:00ba627f7919

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
axe --sysconfdir=PATH configuration prefix is dirname of --conf-path=PATH fix paths in default nginx.conf
author Igor Sysoev <igor@sysoev.ru>
date Tue, 14 Aug 2007 19:26:20 +0000
parents e958b3cab51a
children f69493e8faab
comparison
equal deleted inserted replaced
1393:d16559a1fe1e 1394:00ba627f7919
122 case "$option" in 122 case "$option" in
123 --help) help=yes ;; 123 --help) help=yes ;;
124 124
125 --prefix=*) NGX_PREFIX="$value" ;; 125 --prefix=*) NGX_PREFIX="$value" ;;
126 --sbin-path=*) NGX_SBIN_PATH="$value" ;; 126 --sbin-path=*) NGX_SBIN_PATH="$value" ;;
127 --sysconfdir=*) NGX_CONF_PREFIX="$value" ;;
128 --conf-path=*) NGX_CONF_PATH="$value" ;; 127 --conf-path=*) NGX_CONF_PATH="$value" ;;
129 --error-log-path=*) NGX_ERROR_LOG_PATH="$value";; 128 --error-log-path=*) NGX_ERROR_LOG_PATH="$value";;
130 --pid-path=*) NGX_PID_PATH="$value" ;; 129 --pid-path=*) NGX_PID_PATH="$value" ;;
131 --lock-path=*) NGX_LOCK_PATH="$value" ;; 130 --lock-path=*) NGX_LOCK_PATH="$value" ;;
132 --user=*) NGX_USER="$value" ;; 131 --user=*) NGX_USER="$value" ;;
240 239
241 --help this message 240 --help this message
242 241
243 --prefix=PATH set the installation prefix 242 --prefix=PATH set the installation prefix
244 --sbin-path=PATH set path to the nginx binary file 243 --sbin-path=PATH set path to the nginx binary file
245 --sysconfdir=PATH set the configuration prefix
246 --conf-path=PATH set path to the nginx.conf file 244 --conf-path=PATH set path to the nginx.conf file
247 --error-log-path=PATH set path to the error log 245 --error-log-path=PATH set path to the error log
248 --pid-path=PATH set path to nginx.pid file 246 --pid-path=PATH set path to nginx.pid file
249 --lock-path=PATH set path to nginx.lock file 247 --lock-path=PATH set path to nginx.lock file
250 248
361 NGX_WINE=$WINE 359 NGX_WINE=$WINE
362 fi 360 fi
363 361
364 362
365 NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx} 363 NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx}
366 NGX_CONF_PREFIX=${NGX_CONF_PREFIX:-$NGX_PREFIX}
367 364
368 365
369 case ".$NGX_SBIN_PATH" in 366 case ".$NGX_SBIN_PATH" in
370 ./*) 367 ./*)
371 ;; 368 ;;
383 case ".$NGX_CONF_PATH" in 380 case ".$NGX_CONF_PATH" in
384 ./*) 381 ./*)
385 ;; 382 ;;
386 383
387 .) 384 .)
388 NGX_CONF_PATH=$NGX_CONF_PREFIX/conf/nginx.conf 385 NGX_CONF_PATH=$NGX_PREFIX/conf/nginx.conf
389 ;; 386 ;;
390 387
391 *) 388 *)
392 NGX_CONF_PATH=$NGX_CONF_PREFIX/$NGX_CONF_PATH 389 NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH
393 ;; 390 ;;
394 esac 391 esac
392
393
394 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
395 395
396 396
397 case ".$NGX_PID_PATH" in 397 case ".$NGX_PID_PATH" in
398 ./*) 398 ./*)
399 ;; 399 ;;