Colin Watson has proposed merging
~cjwatson/launchpad:charm-push-backups-argument-ordering into launchpad:master.
Commit message:
charm: Fix argument ordering in postgresql-extras cron job
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/455987
The list of database names is defined with `nargs="+"` in the `push-backups`
script, so it has to come at the end.
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad:charm-push-backups-argument-ordering into launchpad:master.
diff --git a/charm/launchpad-postgresql-extras/templates/crontab.j2 b/charm/launchpad-postgresql-extras/templates/crontab.j2
index f873f31..d9e4d5e 100644
--- a/charm/launchpad-postgresql-extras/templates/crontab.j2
+++ b/charm/launchpad-postgresql-extras/templates/crontab.j2
@@ -4,6 +4,6 @@ MAILTO={{ cron_mailto }}
{% if push_backups_databases and push_backups_destination -%}
# The PostgreSQL charm handles backups, but on production we also need to
# push backups to staging for weekly restores.
-22 * * * * postgres {{ scripts_dir }}/push-backups --bwlimit=10m {% if push_backups_private_ssh_key_path %}--ssh-key {{ push_backups_private_ssh_key_path }} {% endif %}{{ push_backups_databases }} {{ push_backups_destination }}
+22 * * * * postgres {{ scripts_dir }}/push-backups --bwlimit=10m {% if push_backups_private_ssh_key_path %}--ssh-key {{ push_backups_private_ssh_key_path }} {% endif %}{{ push_backups_destination }} {{ push_backups_databases }}
{% endif %}
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
