summaryrefslogtreecommitdiff
path: root/nginx.sh
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-04-07 10:51:47 +0200
committerAndreas Maunz <andreas@maunz.de>2011-04-07 10:51:47 +0200
commitb476edbdf243996f0ccdd21f8675f6fc81edeb84 (patch)
treebeee96c0a464ff24707de5652bb962f65574bf42 /nginx.sh
parent0c4a69141869c4573b5a27ec3a49d19a289e9a1b (diff)
Fixed nginx conf
Diffstat (limited to 'nginx.sh')
-rwxr-xr-xnginx.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/nginx.sh b/nginx.sh
index 498dd0b..31e4842 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -37,15 +37,16 @@ fi
if ! $NGINX_DONE; then
cmd="$PIN --auto-download --auto --prefix=$NGINX_DEST" && run_cmd "$cmd" "Install"
- cd "$RUBY_DEST/lib/ruby/gems/1.8/gems/" >>$LOG 2>&1
- passenger=`ls -d passenger*`
- cd - >>$LOG 2>&1
- servername=`hostname`
- ruby_dest=`echo $RUBY_DEST | sed 's/\//\\\//g'`
- nginx_dest=`echo $NGINX_DEST | sed 's/\//\\\//g'`
- cmd="sed -i -e \"s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$ruby_dest/;s/NGINX_DEST/$nginx_dest/\" ./nginx.conf" && run_cmd "$cmd" "Config"
- cmd="cp ./nginx.conf \"$NGINX_DEST/conf\"" && run_cmd "$cmd" "Copy"
fi
+cd "$RUBY_DEST/lib/ruby/gems/1.8/gems/" >>$LOG 2>&1
+passenger=`ls -d passenger*`
+cd - >>$LOG 2>&1
+servername=`hostname`
+ruby_dest=`echo $RUBY_DEST | sed 's/\//\\\//g'`
+nginx_dest=`echo $NGINX_DEST | sed 's/\//\\\//g'`
+cmd="sed -i -e \"s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$ruby_dest/;s/NGINX_DEST/$nginx_dest/\" ./nginx.conf" && run_cmd "$cmd" "Config"
+cmd="cp ./nginx.conf \"$NGINX_DEST/conf\"" && run_cmd "$cmd" "Copy"
+
cd "$DIR"