From d002a2770a99e7e8b36bf98618575ecc13f86cd0 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 10:42:49 +0200 Subject: Fixed nginx conf --- nginx.sh | 5 +++-- 1 file 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" -- cgit v1.2.3