diff options
Diffstat (limited to 'script')
-rwxr-xr-x | script/mysociety-switch-to-shared | 1 | ||||
-rwxr-xr-x | script/rails-deploy-before-down | 25 | ||||
-rwxr-xr-x | script/request-creation-graph | 2 | ||||
-rwxr-xr-x | script/site-specific-install.sh | 1 | ||||
-rwxr-xr-x | script/user-use-graph | 2 |
5 files changed, 3 insertions, 28 deletions
diff --git a/script/mysociety-switch-to-shared b/script/mysociety-switch-to-shared index f82e77706..801532e57 100755 --- a/script/mysociety-switch-to-shared +++ b/script/mysociety-switch-to-shared @@ -23,6 +23,7 @@ mkdir -p "$SHARED_DIR" for F in \ cache \ + log \ public/foi-live-creation.png \ public/foi-user-use.png \ config/aliases \ diff --git a/script/rails-deploy-before-down b/script/rails-deploy-before-down index 42284b00d..c44bfe552 100755 --- a/script/rails-deploy-before-down +++ b/script/rails-deploy-before-down @@ -32,31 +32,6 @@ else OPTION_STAGING_SITE=1 fi -# create initial log files -if [ -e $TOP_DIR/../logs ] -then - # 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 -fi - -cd log -touch development.log fastcgi.crash.log production.log test.log -cd .. - # Returns 0 if an element is present in a bash array, and 1 otherwise # Taken from: http://stackoverflow.com/a/8574392/223092 contains () { diff --git a/script/request-creation-graph b/script/request-creation-graph index ef1d2cf73..7d347a7d2 100755 --- a/script/request-creation-graph +++ b/script/request-creation-graph @@ -17,7 +17,7 @@ cd `dirname $0` cd ../ source commonlib/shlib/deployfns -# XXX this is nasty :) +# TODO: this is nasty :) OPTION_FOI_DB_HOST=`grep "host:" config/database.yml | head --lines=1 | cut -d ":" -f 2` OPTION_FOI_DB_PORT=`grep "port:" config/database.yml | head --lines=1 | cut -d ":" -f 2` OPTION_FOI_DB_NAME=`grep "database:" config/database.yml | head --lines=1 | cut -d ":" -f 2` diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh index 7d47a5990..fce230822 100755 --- a/script/site-specific-install.sh +++ b/script/site-specific-install.sh @@ -148,7 +148,6 @@ echo -n "Creating /etc/cron.d/alaveteli... " sed -r \ -e "/foi-purge-varnish/d" \ -e "s,^(MAILTO=).*,\1root@$HOST," \ - -e "s,run-with-lockfile,$REPOSITORY/commonlib/bin/run-with-lockfile.sh,g" \ -i /etc/cron.d/alaveteli echo $DONE_MSG diff --git a/script/user-use-graph b/script/user-use-graph index f508c9cb6..00eeb36f8 100755 --- a/script/user-use-graph +++ b/script/user-use-graph @@ -16,7 +16,7 @@ cd `dirname $0` cd ../ source commonlib/shlib/deployfns -# XXX this is nasty :) +# TODO: this is nasty :) OPTION_FOI_DB_HOST=`grep "host:" config/database.yml | head --lines=1 | cut -d ":" -f 2` OPTION_FOI_DB_PORT=`grep "port:" config/database.yml | head --lines=1 | cut -d ":" -f 2` OPTION_FOI_DB_NAME=`grep "database:" config/database.yml | head --lines=1 | cut -d ":" -f 2` |