Merge lp:~brad-marshall/charms/trusty/postgresql/fix-cron-backups into lp:charms/trusty/postgresql

Proposed by Brad Marshall
Status: Merged
Merged at revision: 108
Proposed branch: lp:~brad-marshall/charms/trusty/postgresql/fix-cron-backups
Merge into: lp:charms/trusty/postgresql
Diff against target: 23 lines (+3/-6)
1 file modified
templates/postgres.cron.tmpl (+3/-6)
To merge this branch: bzr merge lp:~brad-marshall/charms/trusty/postgresql/fix-cron-backups
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+241925@code.launchpad.net

Description of the change

Fixing the cron backups to not split across multiple lines, which doesn't work.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Ta.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'templates/postgres.cron.tmpl'
--- templates/postgres.cron.tmpl 2014-07-04 13:22:29 +0000
+++ templates/postgres.cron.tmpl 2014-11-17 06:42:42 +0000
@@ -1,16 +1,13 @@
1# Maintained by juju1# Maintained by juju
2#2#
3{% if backup_schedule -%}3{% if backup_schedule -%}
4{{backup_schedule}} postgres \4{{backup_schedule}} postgres {{scripts_dir}}/pg_backup_job {{backup_retention_count}}
5 {{scripts_dir}}/pg_backup_job {{backup_retention_count}}
6{% endif -%}5{% endif -%}
76
8{% if swiftwal_backup_schedule -%}7{% if swiftwal_backup_schedule -%}
9{{swiftwal_backup_schedule}} postgres \8{{swiftwal_backup_schedule}} postgres {{swiftwal_backup_command}} && {{swiftwal_prune_command}}
10 {{swiftwal_backup_command}} && {{swiftwal_prune_command}}
11{% endif -%}9{% endif -%}
1210
13{% if wal_e_backup_schedule -%}11{% if wal_e_backup_schedule -%}
14{{wal_e_backup_schedule}} postgres \12{{wal_e_backup_schedule}} postgres {{wal_e_backup_command}} && {{wal_e_prune_command}}
15 {{wal_e_backup_command}} && {{wal_e_prune_command}}
16{% endif -%}13{% endif -%}

Subscribers

People subscribed via source and target branches

to all changes: