lp-signing

Merge ~cjwatson/lp-signing:rsync-gunicorn-logs into lp-signing:master

  1. Git
  2. lp:~cjwatson/lp-signing
  3. rsync-gunicorn-logs
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: b0bc2e462893d7ad070a77ed035e87a5991b5aae
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/lp-signing:rsync-gunicorn-logs
Merge into: lp-signing:master
Diff against target: 16 lines (+8/-0)
1 file modified
charm/lp-signing/templates/lp-signing-rsync.j2 (+8/-0)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+384727@code.launchpad.net

Commit message

Publish gunicorn logs over rsync

Description of the change

layer-ols-wsgi hardcodes gunicorn logs to /var/log/gunicorn.log, so they aren't under the existing rsync module that publishes /srv/lp-signing/logs/. Add a special module that publishes only /var/log/gunicorn.log* and not other files in that directory.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/lp-signing/templates/lp-signing-rsync.j2 b/charm/lp-signing/templates/lp-signing-rsync.j2
2index 97d85fe..cfb0b3a 100644
3--- a/charm/lp-signing/templates/lp-signing-rsync.j2
4+++ b/charm/lp-signing/templates/lp-signing-rsync.j2
5@@ -6,3 +6,11 @@
6 read only = true
7 hosts allow = {{ log_hosts_allow }}
8
9+[lp-signing-gunicorn-logs]
10+ path = /var/log
11+ filter = include /gunicorn.log* exclude /*
12+ comment = LP Signing Gunicorn Logs
13+ list = false
14+ read only = true
15+ hosts allow = {{ log_hosts_allow }}
16+

Subscribers

People subscribed via source and target branches