aboutsummaryrefslogtreecommitdiffstats
path: root/script
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-07-10 12:56:04 +0100
committerGareth Rees <gareth@mysociety.org>2014-07-10 12:56:04 +0100
commitf9ecaf75b398e6f0e09d291d7f34fc705fdeb0a8 (patch)
treee02f9c35386586030fe5dc4e7fd4b0ef6d11baf5 /script
parent33dad12a49542046549e975bf5543ce687cd2436 (diff)
parent5ed12438107e7c2a4ede9ec6ac93b7e35959c482 (diff)
Merge branch 'log-config' into rails-3-develop
Diffstat (limited to 'script')
-rwxr-xr-xscript/mysociety-switch-to-shared1
-rwxr-xr-xscript/rails-deploy-before-down25
2 files changed, 1 insertions, 25 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 () {