diff options
author | rautenberg <rautenberg@in-silico.ch> | 2012-03-13 12:13:23 +0100 |
---|---|---|
committer | rautenberg <rautenberg@in-silico.ch> | 2012-03-13 12:13:23 +0100 |
commit | 65b517dd4494d730bf5602bd070a59d0044efe5b (patch) | |
tree | 7443c67b2813a9f04483ba8c59f0fd8c2a798923 /nginx.sh | |
parent | fe3e3f88762df7cc57df76fe4d2a10602a3daa73 (diff) | |
parent | 803ae809cc5092e082ee527dac6eb25c1a63dcf3 (diff) |
Merge branch 'release/v3.1.0'v3.1.0
Diffstat (limited to 'nginx.sh')
-rwxr-xr-x | nginx.sh | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -26,7 +26,7 @@ if [ ! -e "$GIT" ]; then fi -LOG="/tmp/`basename $0`-log.txt" +LOG="$HOME/tmp/`basename $0`-log.txt" echo echo "Nginx ('$LOG'):" @@ -53,7 +53,15 @@ servername=`hostname` $GIT checkout nginx.conf>>$LOG 2>&1 cmd="sed -i -e \"s,PASSENGER,$passenger,;s,SERVERNAME,$servername,;s,RUBY_DEST,$RUBY_DEST,;s,NGINX_DEST,$NGINX_DEST,;s,WWW_DEST,$WWW_DEST,\" ./nginx.conf" && run_cmd "$cmd" "Config" cmd="sed -i -e \"s,USER,`whoami`,\" ./nginx.conf" && run_cmd "$cmd" "User" + +if [ -z "$NGINX_PORT" ]; then + NGINX_PORT=80 +else + NGINX_PORT=`echo "$NGINX_PORT" | sed 's/^.//g'` +fi +cmd="sed -i -e \"s,NGINX_PORT,$NGINX_PORT,\" ./nginx.conf" && run_cmd "$cmd" "NGINX_PORT" cmd="cp ./nginx.conf \"$NGINX_DEST/conf\"" && run_cmd "$cmd" "Copy" +$GIT checkout nginx.conf>>$LOG 2>&1 if [ ! -f $NGINX_CONF ]; then echo "if ! echo \"\$PATH\" | grep \"$NGINX_DEST\">/dev/null 2>&1; then export PATH=$NGINX_DEST/sbin:\$PATH; fi" >> "$NGINX_CONF" |