Merge branch 'release/0.6.3' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/request/show.rhtml
    spec/models/info_request_spec.rb

1 files changed, 16 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
+
+
+