Merge lp:~tcuthbert/charm-haproxy/trunk into lp:charm-haproxy

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Barry Price
Approved revision: 135
Merged at revision: 135
Proposed branch: lp:~tcuthbert/charm-haproxy/trunk
Merge into: lp:charm-haproxy
Diff against target: 28 lines (+17/-1)
1 file modified
config.yaml (+17/-1)
To merge this branch: bzr merge lp:~tcuthbert/charm-haproxy/trunk
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+368534@code.launchpad.net

Commit message

Provide example for custom logrotate config

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Barry Price (barryprice) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 135

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2019-06-07 09:24:02 +0000
3+++ config.yaml 2019-06-07 10:10:04 +0000
4@@ -97,7 +97,23 @@
5 logrotate_config:
6 default: ""
7 type: string
8- description: Override package logrotate configuration.
9+ description: |
10+ Override package logrotate configuration.
11+ .
12+ For example.
13+ .
14+ /var/log/haproxy.log {
15+ weekly
16+ rotate 52
17+ missingok
18+ notifempty
19+ compress
20+ delaycompress
21+ postrotate
22+ invoke-rc.d rsyslog rotate >/dev/null 2>&1 || true
23+ endscript
24+ }
25+ .
26 enable_monitoring:
27 default: False
28 type: boolean

Subscribers

People subscribed via source and target branches

to all changes: