Ubuntu Mirror Charm

Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:remove-recursive-chown into ubuntu-mirror-charm:master

  1. Git
  2. lp:~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm
  3. remove-recursive-chown
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Haw Loeung
Approved revision: c9d0b92a292f7e0d16fa290c5cf070569a9fa2ce
Merged at revision: e1693e24f472d137f3df5eeef453530476bb0f80
Proposed branch: ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:remove-recursive-chown
Merge into: ubuntu-mirror-charm:master
Diff against target: 20 lines (+0/-2)
1 file modified
hooks/hooks.py (+0/-2)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+390947@code.launchpad.net

Commit message

do not recursively chown /srv/ftp.root

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 e1693e24f472d137f3df5eeef453530476bb0f80

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/hooks.py b/hooks/hooks.py
2index 69400ad..1f56257 100755
3--- a/hooks/hooks.py
4+++ b/hooks/hooks.py
5@@ -20,7 +20,6 @@ import yaml
6
7 from charmhelpers.core.host import (
8 adduser,
9- chownr,
10 lsb_release,
11 mkdir,
12 service_reload,
13@@ -1081,7 +1080,6 @@ def configure_user(conf, hostname):
14 def configure_directories(conf, hostname):
15 if not os.path.isdir("/srv/ftp.root"):
16 mkdir("/srv/ftp.root")
17- chownr("/srv/ftp.root", conf.mirror_user(), conf.mirror_user(), follow_links=False)
18
19
20 @hooks.hook("install.real")

Subscribers

People subscribed via source and target branches