Fixed nginx conf

2 files changed, 9 insertions, 1 deletions

diff --git a/base-install.sh b/base-install.sh
index 30d7d0f..a713928 100644
--- a/base-install.sh
+++ b/base-install.sh
@@ -27,7 +27,7 @@ fi
 touch $OT_UI_CONF
 
 # Pkgs
-packs="lsb-release binutils gcc g++ gfortran wget hostname pwgen git-core raptor-utils r-base sun-java6-jdk libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev sun-java6-jdk libreadline5-dev r-base-dev "
+packs="lsb-release binutils gcc g++ gfortran wget hostname pwgen git-core raptor-utils r-base sun-java6-jdk libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev sun-java6-jdk libreadline5-dev r-base-dev git"
 
 echo
 echo "Base Packages:"
diff --git a/nginx.sh b/nginx.sh
index 1c87d05..b312e5e 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -19,6 +19,13 @@ if [ ! -e "$PIN" ]; then
   exit 1
 fi
 
+GIT="`which git`"
+if [ ! -e "$GIT" ]; then
+  echo "'git' missing. Install 'git' first. Aborting..."
+  exit 1
+fi
+
+
 LOG="/tmp/`basename $0`-log.txt"
 
 echo
@@ -43,6 +50,7 @@ cd "$RUBY_DEST/lib/ruby/gems/1.8/gems/" >>$LOG 2>&1
 passenger=`ls -d passenger*`
 cd - >>$LOG 2>&1
 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,\" ./nginx.conf" && run_cmd "$cmd" "Config"
 cmd="cp ./nginx.conf \"$NGINX_DEST/conf\"" && run_cmd "$cmd" "Copy"