diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 11:13:38 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 11:13:38 -0700 |
| commit | 411aee219e14fe3d942699f230f7a8e3ed70bfe0 (patch) | |
| tree | cbd41460afc2f0e24d7490d3034eee2544f3bac5 /script/make-crontab | |
| parent | 9ccc03bc7d4c4e9064a9217d6e332abfb3f15b7f (diff) | |
| parent | 0d9de53bdccf20cc2884f0ad896d5e9dd2edee03 (diff) | |
Merge branch 'release/0.12' into wdtk
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
spec/models/info_request_spec.rb
Diffstat (limited to 'script/make-crontab')
| -rwxr-xr-x | script/make-crontab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/script/make-crontab b/script/make-crontab index 1b4fbabbd..d214f1485 100755 --- a/script/make-crontab +++ b/script/make-crontab @@ -5,7 +5,7 @@ mailto = "recipient-of-any-errors@localhost" user = "user-to-run-as" location = "/path/to/alaveteli" -template = open("config/crontab.ugly").read() +template = open("config/crontab-example").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) |