summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-04-07 10:42:49 +0200
committerAndreas Maunz <andreas@maunz.de>2011-04-07 10:42:49 +0200
commitd002a2770a99e7e8b36bf98618575ecc13f86cd0 (patch)
tree44f6bf5a26ec5820c8d7c21e61d631686f790804
parent71d47a343cfaa5dc8f00ea0cea3374b6cadc7cb6 (diff)
Fixed nginx conf
-rwxr-xr-xnginx.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/nginx.sh b/nginx.sh
index 2e52f62..776acf0 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -38,10 +38,11 @@ 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*`;
+ passenger=`ls -d passenger*`
cd - >>$LOG 2>&1
servername=`hostname`
- sed -e "s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$RUBY_DEST/;s/NGINX_DEST/$NGINX_DEST/" "./nginx.conf" > $NGINX_DEST/conf/nginx.conf 2>>$LOG
+ 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 "$DIR"