summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2012-10-23 18:44:27 +0200
committerintrigeri <intrigeri@boum.org>2012-10-25 13:25:43 +0200
commitb3ea67d228a9b032372a1016246f6ff35273050f (patch)
tree9ecd3378bc20ad540c79763468951fe27a989e84 /manifests
parent81ee44c1a4fe862e1a65ef41193486cc99dc7f16 (diff)
Do not enforce permissions when manage_incoming_conf is false
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b1ca7d4..cccc34c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -91,7 +91,7 @@ class reprepro {
content => template("reprepro/uploaders.erb");
"$basedir/conf/incoming":
- mode => 0664, owner => root, group => reprepro;
+ ensure => present;
"$basedir/index.html":
mode => 0664, owner => root, group => reprepro,
@@ -137,6 +137,9 @@ class reprepro {
if $reprepro_manage_incoming_conf {
File["$basedir/conf/incoming"] {
+ mode => 0664,
+ owner => root,
+ group => reprepro,
source => "puppet://$server/modules/reprepro/incoming"
}
}