diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-10-29 16:13:39 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-10-29 16:13:39 -0500 |
| commit | 42652ad1d5997473ee65e4f6a49429c03d5f48ad (patch) | |
| tree | 9090f814bf6cc2d91f71213e163678a47e19493a | |
| parent | 3c486f3f68aa4c7f9d821d4203f67c19ae7e16f6 (diff) | |
| parent | b63eadb08c1d1b475f4fa201442055ec02f05a47 (diff) | |
| download | mediagoblin-42652ad1d5997473ee65e4f6a49429c03d5f48ad.tar.lz mediagoblin-42652ad1d5997473ee65e4f6a49429c03d5f48ad.tar.xz mediagoblin-42652ad1d5997473ee65e4f6a49429c03d5f48ad.zip | |
Merge remote branch 'remotes/elrond/misc/lazyserver_paste_local'
| -rwxr-xr-x | lazyserver.sh | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lazyserver.sh b/lazyserver.sh index e4afdaa5..63818a6a 100755 --- a/lazyserver.sh +++ b/lazyserver.sh @@ -18,13 +18,24 @@ if [ "$1" = "-h" ] then - echo "$0 [-h] [-c paste.ini] ARGS_to_paster" + echo "$0 [-h] [-c paste.ini] [ARGS_to_paster ...]" + echo "" echo " For example:" - echo " $0 -c fcgi.ini port_number=23371" + echo " $0 -c fcgi.ini port_number=23371" + echo " or: $0 --server-name=fcgi" + echo "" + echo " The configfile defaults to paste_local.ini," + echo " if that is readable, otherwise paste.ini." exit 1 fi PASTE_INI=paste.ini + +if [ -r paste_local.ini ] +then + PASTE_INI=paste_local.ini +fi + if [ "$1" = "-c" ] then PASTE_INI="$2" @@ -32,6 +43,8 @@ then shift fi +echo "Using paste config: $PASTE_INI" + if [ -f ./bin/paster ]; then echo "Using ./bin/paster"; export PASTER="./bin/paster"; |