Juju Charms Collection
daisy-retracer package

Merge lp:~thedac/charms/precise/daisy-retracer/fix-import-bugs-cron into lp:~daisy-pluckers/charms/precise/daisy-retracer/trunk

  1. Precise Pangolin (12.04)
  2. fix-import-bugs-cron
  3. Merge into trunk
Proposed by David Ames
Status: Merged
Merged at revision: 56
Proposed branch: lp:~thedac/charms/precise/daisy-retracer/fix-import-bugs-cron
Merge into: lp:~daisy-pluckers/charms/precise/daisy-retracer/trunk
Diff against target: 19 lines (+2/-2)
2 files modified
hooks/install (+1/-1)
templates/whoopsie-import-bugs.cron.tmpl (+1/-1)
To merge this branch: bzr merge lp:~thedac/charms/precise/daisy-retracer/fix-import-bugs-cron
Reviewer Review Type Date Requested Status
Daisy Pluckers Pending
Review via email: mp+222859@code.launchpad.net

Description of the change

Fix paths and ownership for import bugs cronn

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

looks good, thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2014-06-11 13:49:32 +0000
3+++ hooks/install 2014-06-11 18:44:01 +0000
4@@ -58,6 +58,6 @@
5 sed -i "s|cassandra_hosts =.*|cassandra_hosts = []|" "$LOCAL_CONFIG_PATH"
6
7 chown -R $USER_CODE_OWNER:$USER_CODE_RUNNER "/srv/$BASEDIR"
8-chown -R $USER_CODE_RUNNER:$GROUP_CODE_RUNNER "$CACHE_DIR"
9+chown -R $USER_CODE_RUNNER:$GROUP_CODE_RUNNER "$CACHE_DIR" "$VAR_DIR"
10
11 exit 0
12
13=== modified file 'templates/whoopsie-import-bugs.cron.tmpl'
14--- templates/whoopsie-import-bugs.cron.tmpl 2013-05-16 11:19:59 +0000
15+++ templates/whoopsie-import-bugs.cron.tmpl 2014-06-11 18:44:01 +0000
16@@ -1,2 +1,2 @@
17 # This file is generated by Juju. Do not make local changes.
18-10 * * * * $USER_CODE_RUNNER rsync -qz $DUPLICATE_DB /srv/daisy.ubuntu.com/var/apport_duplicates.db && PYTHONPATH=$LOCAL_CONFIG_LOCATION:$CODE_LOCATION $CODE_LOCATION/tools/import_bugs.py $VAR_DIR/apport_duplicates.db
19+10 * * * * $USER_CODE_RUNNER rsync -qz $DUPLICATE_DB $VAR_DIR/apport_duplicates.db && PYTHONPATH=$LOCAL_CONFIG_LOCATION:$CODE_LOCATION $CODE_LOCATION/tools/import_bugs.py $VAR_DIR/apport_duplicates.db

Subscribers

People subscribed via source and target branches

to all changes: