charm-haproxy

Merge lp:~mthaddon/charm-haproxy/jammy into lp:charm-haproxy

  1. jammy
  2. Merge into trunk
Proposed by Tom Haddon
Status: Merged
Approved by: Haw Loeung
Approved revision: 156
Merged at revision: 156
Proposed branch: lp:~mthaddon/charm-haproxy/jammy
Merge into: lp:charm-haproxy
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~mthaddon/charm-haproxy/jammy
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+446764@code.launchpad.net

Commit message

Make sure we're writing the TLS pem file correctly

Description of the change

Make sure we're writing the TLS pem file correctly

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
Haw Loeung (hloeung) wrote :

LGTM

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

Change successfully merged at revision 156

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 2023-07-13 09:58:25 +0000
3+++ hooks/hooks.py 2023-07-13 10:13:07 +0000
4@@ -1425,7 +1425,7 @@
5 # user (see below).
6 old_mask = os.umask(0o077)
7 with open(path, 'w') as f:
8- f.write(content)
9+ f.write(content.decode('utf-8'))
10 os.umask(old_mask)
11 uid = pwd.getpwnam('haproxy').pw_uid
12 os.chown(path, uid, -1)

Subscribers

People subscribed via source and target branches

to all changes: