Juju Charms Collection
logstash-forwarder package

Merge lp:~woutervb/charms/trusty/logstash-forwarder/focal into lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk

  1. Trusty Tahr (14.04)
  2. focal
  3. Merge into trunk
Proposed by Wouter van Bommel
Status: Merged
Merged at revision: 27
Proposed branch: lp:~woutervb/charms/trusty/logstash-forwarder/focal
Merge into: lp:~canonical-is-sa/charms/trusty/logstash-forwarder/trunk
Diff against target: 21 lines (+3/-3)
1 file modified
hooks/hooks.py (+3/-3)
To merge this branch: bzr merge lp:~woutervb/charms/trusty/logstash-forwarder/focal
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Review via email: mp+404740@code.launchpad.net
To post a comment you must log in.
lp:~woutervb/charms/trusty/logstash-forwarder/focal updated
29. By Wouter van Bommel

Open files as binary when writing certificate files

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2021-06-24 14:41:32 +0000
3+++ hooks/hooks.py 2021-06-25 03:57:35 +0000
4@@ -96,15 +96,15 @@
5 if not os.path.exists(conf.configDir()):
6 mkdir(conf.configDir())
7 if conf.sslCert():
8- with open(conf.sslCertFile(), "w") as f:
9+ with open(conf.sslCertFile(), "wb") as f:
10 os.chmod(conf.sslCertFile(), 0o644)
11 f.write(base64.b64decode(conf.sslCert()))
12 if conf.sslKey():
13- with open(conf.sslKeyFile(), "w") as f:
14+ with open(conf.sslKeyFile(), "wb") as f:
15 os.chmod(conf.sslKeyFile(), 0o600)
16 f.write(base64.b64decode(conf.sslKey()))
17 if conf.sslCACert():
18- with open(conf.sslCACertFile(), "w") as f:
19+ with open(conf.sslCACertFile(), "wb") as f:
20 os.chmod(conf.sslCACertFile(), 0o644)
21 f.write(base64.b64decode(conf.sslCACert()))
22

Subscribers

People subscribed via source and target branches