Launchpad code imports

Merge ~cjwatson/lp-codeimport:charm-storage-home-dir-ownership into lp-codeimport:master

  1. Git
  2. lp:~cjwatson/lp-codeimport
  3. charm-storage-home-dir-ownership
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: e5fdecc02ad17707fe83b577237a2b487dda3038
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/lp-codeimport:charm-storage-home-dir-ownership
Merge into: lp-codeimport:master
Diff against target: 23 lines (+5/-7)
1 file modified
charm/lp-codeimport-storage/reactive/lp-codeimport-storage.py (+5/-7)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+439954@code.launchpad.net

Commit message

charm/lp-codeimport-storage: Fix ownership of /home/importd

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/lp-codeimport-storage/reactive/lp-codeimport-storage.py b/charm/lp-codeimport-storage/reactive/lp-codeimport-storage.py
2index 5be4349..99ceb26 100644
3--- a/charm/lp-codeimport-storage/reactive/lp-codeimport-storage.py
4+++ b/charm/lp-codeimport-storage/reactive/lp-codeimport-storage.py
5@@ -46,13 +46,11 @@ def configure():
6 host.add_group("importd")
7 host.adduser("importd", primary_group="importd")
8 for directory in ("/srv/importd/sources", "/srv/importd/www"):
9- if not os.path.exists(directory):
10- host.mkdir(
11- directory, owner="importd", group="importd", perms=0o755
12- )
13- ssh_dir = "/home/importd/.ssh"
14- if not os.path.exists(ssh_dir):
15- host.mkdir(ssh_dir, owner="importd", group="importd", perms=0o700)
16+ host.mkdir(directory, owner="importd", group="importd", perms=0o755)
17+ home_dir = "/home/importd"
18+ host.mkdir(home_dir, owner="importd", group="importd", perms=0o755)
19+ ssh_dir = os.path.join(home_dir, ".ssh")
20+ host.mkdir(ssh_dir, owner="importd", group="importd", perms=0o700)
21 config = dict(hookenv.config())
22 config["codeimport_subnets"] = codeimport_storage.get_codeimport_subnets()
23 config["public_ssh_key"] = base64.b64decode(

Subscribers

People subscribed via source and target branches