Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

1 files changed, 32 insertions, 27 deletions

diff --git a/script/rails-post-deploy b/script/rails-post-deploy
index de950311c..c09868347 100755
--- a/script/rails-post-deploy
+++ b/script/rails-post-deploy
@@ -24,27 +24,32 @@ fi
 # read config file in for later (STAGING_SITE)
 if [ -e "config/general" ] || [ -e "config/general.yml" ]
 then
-	. commonlib/shlib/deployfns
-	read_conf config/general
+    . commonlib/shlib/deployfns
+    read_conf config/general
 else
-	OPTION_DOMAIN=127.0.0.1:3000
-	OPTION_STAGING_SITE=1
+    OPTION_DOMAIN=127.0.0.1:3000
+    OPTION_STAGING_SITE=1
 fi
 
 # create initial log files
 if [ -e $TOP_DIR/../logs ]
 then
-	# mySociety servers have logs dir in level above
-	rm -f log
-	ln -s $TOP_DIR/../logs log
+    # mySociety servers have logs dir in level above
+    if ! [ -h log ] && [ -d log ]
+    then
+        # If log is a directory rather than a symlink, move that
+        # directory out of the way:
+        mv log log.original
+    fi
+    ln -sfn $TOP_DIR/../logs log
 else
-	# otherwise just make the directory
-	if [ -h log ]
-	then
-		# remove any old-style symlink first
-		rm -f log
-	fi
-	mkdir -p log
+    # otherwise just make the directory
+    if [ -h log ]
+    then
+        # remove any old-style symlink first
+        rm -f log
+    fi
+    mkdir -p log
 fi
 
 cd log
@@ -55,18 +60,18 @@ cd ..
 if [ "$OPTION_STAGING_SITE" = "0" ]
 then
     cat <<-END
-		
-	***************************************************************** 
-	WARNING: About to make config/rails_env.rb which, via special
-	code in config/boot.rb, forces the Rails environment to be
-	"production". If this is a development system, please edit your
-	config/general.yml file and set the STAGING_SITE option to 1,
-	and also delete the generated config/rails_env.rb file.
-	Alternatively, you can override config/rails_env.rb at any time 
-	with an environment variable.
-	***************************************************************** 
-	
-	END
+
+    *****************************************************************
+    WARNING: About to make config/rails_env.rb which, via special
+    code in config/boot.rb, forces the Rails environment to be
+    "production". If this is a development system, please edit your
+    config/general.yml file and set the STAGING_SITE option to 1,
+    and also delete the generated config/rails_env.rb file.
+    Alternatively, you can override config/rails_env.rb at any time
+    with an environment variable.
+    *****************************************************************
+
+END
     echo "ENV['RAILS_ENV'] ||= 'production'" > config/rails_env.rb
 fi
 
@@ -81,7 +86,7 @@ then
 fi
 if [ "$TRAVIS" = "true" ]
 then
-   bundle_install_options="--without development develop --deployment"
+    bundle_install_options="--without development develop --deployment"
 fi
 bundle install $bundle_install_options