Launchpad itself

Merge ~cjwatson/launchpad:charm-ftpmaster-rsync-secrets-permissions into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-ftpmaster-rsync-secrets-permissions
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: e63274307e1509fb702b517378796a8c808eb6f8
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-ftpmaster-rsync-secrets-permissions
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py (+1/-1)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+454062@code.launchpad.net

Commit message

charm: Fix permissions of rsync secrets file

Description of the change

rsyncd.conf(5) says 'The file must normally not be readable by "other"'. Fix permissions so that rsync will be prepared to read it.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py b/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
2index 1ccd609..ccf2a10 100644
3--- a/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
4+++ b/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
5@@ -66,7 +66,7 @@ def configure():
6 "ftp.secrets.j2",
7 rsync_secrets_path,
8 config,
9- perms=0o644,
10+ perms=0o640,
11 )
12 config["rsync_secrets_path"] = rsync_secrets_path
13 elif os.path.exists("/etc/rsyncd/ftp.secrets"):

Subscribers

People subscribed via source and target branches

to status/vote changes: