Merge branch 'release/0.6.3'0.6.3

2 files changed, 28 insertions, 0 deletions

diff --git a/script/make-crontab b/script/make-crontab
new file mode 100755
index 000000000..1b4fbabbd
--- /dev/null
+++ b/script/make-crontab
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+import re
+
+mailto = "recipient-of-any-errors@localhost"
+user = "user-to-run-as"
+location = "/path/to/alaveteli"
+
+template = open("config/crontab.ugly").read()
+template = re.sub(r"MAILTO=.*", "MAILTO=%s" % mailto, template)
+template = template.replace("!!(*= $user *)!!", user)
+template = re.sub(r"/data/vhost/.*/script", location + "/script", template)
+
+print template
+
+
+
diff --git a/script/rails-post-deploy b/script/rails-post-deploy
index 193d0bbec..dd2e61877 100755
--- a/script/rails-post-deploy
+++ b/script/rails-post-deploy
@@ -82,12 +82,23 @@ fi
 
 bundle install $bundle_install_options
 
+function run_post_install {
+    NAME=`echo $1 | sed -re 's/.*\/(.*)\.git.?/\1/'`
+    POST_INSTALL="vendor/plugins/$NAME/post_install.rb"
+    if [ -e $POST_INSTALL ]
+    then
+        echo "running post install script at $POST_INSTALL..."
+        script/runner $POST_INSTALL
+    fi
+}
+
 if [ -n "$OPTION_THEME_URLS" ]
 then
     for THEME in "${OPTION_THEME_URLS[@]}"
     do
         echo "Installing $THEME..."
         script/plugin install --force $THEME
+        run_post_install $THEME
     done
 fi
 
@@ -96,6 +107,7 @@ if [ -n "$OPTION_THEME_URL" ]
 then
         echo "Installing $OPTION_THEME_URL using deprecated THEME_URL..."
         script/plugin install --force $OPTION_THEME_URL
+        run_post_install $OPTION_THEME_URL
 fi
 
 # upgrade database