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

[Wouter van Bommel]

[lp:~woutervb/charms/trusty/logstash-forwarder/focal]

29. By Wouter van Bommel on 2021-06-25

Open files as binary when writing certificate files

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2021-06-24 14:41:32 +0000
+++ hooks/hooks.py	2021-06-25 03:57:35 +0000
@@ -96,15 +96,15 @@
     if not os.path.exists(conf.configDir()):
         mkdir(conf.configDir())
     if conf.sslCert():
-        with open(conf.sslCertFile(), "w") as f:
+        with open(conf.sslCertFile(), "wb") as f:
             os.chmod(conf.sslCertFile(), 0o644)
             f.write(base64.b64decode(conf.sslCert()))
     if conf.sslKey():
-        with open(conf.sslKeyFile(), "w") as f:
+        with open(conf.sslKeyFile(), "wb") as f:
             os.chmod(conf.sslKeyFile(), 0o600)
             f.write(base64.b64decode(conf.sslKey()))
     if conf.sslCACert():
-        with open(conf.sslCACertFile(), "w") as f:
+        with open(conf.sslCACertFile(), "wb") as f:
             os.chmod(conf.sslCACertFile(), 0o644)
             f.write(base64.b64decode(conf.sslCACert()))