From 0d956b0928b30d348d1646adaec429741a72139a Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Thu, 19 Sep 2013 10:54:51 +0100 Subject: Normalize whitespace in rails-post-deploy The rails-post-deploy script unfortunately uses a mixtures of spaces and 0x09 to represent indentation, so it's not even clear what local convention to follow. It appears from the mixture that the intention is that the tabs should represent 4 spaces, so this commit replaces them, strips trailing whitespace and changes some non-standard indentation at the end of a bash heredoc. --- script/rails-post-deploy | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'script/rails-post-deploy') diff --git a/script/rails-post-deploy b/script/rails-post-deploy index de950311c..bf639855b 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -24,27 +24,27 @@ 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 + rm -f log + ln -s $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 +55,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 +81,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 -- cgit v1.2.3 From 90fa620147476b9215eed17da53b156e395ec144 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Thu, 19 Sep 2013 11:05:37 +0100 Subject: Deal with ../logs existing, and log not being a symlink The rails-post-deploy script would error if the log directory existed (rather than being a symlink to another directory, for example) and the ../logs directory also existed. This commit changes this behaviour to move the existing log directory out of the way in this case. In addition, this commit switches from removing the old symlink and creating a new one (which creates a gap in time during which the log directory doesn't exist) to using "ln -snf" to just overwrite any existing symlink or file. (Note that this is still not an atomic operation, but it's bound to leave less time between removal and creation.) --- script/rails-post-deploy | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'script/rails-post-deploy') diff --git a/script/rails-post-deploy b/script/rails-post-deploy index bf639855b..c09868347 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -35,8 +35,13 @@ fi if [ -e $TOP_DIR/../logs ] then # mySociety servers have logs dir in level above - rm -f log - ln -s $TOP_DIR/../logs log + 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 ] -- cgit v1.2.3