From b3ea67d228a9b032372a1016246f6ff35273050f Mon Sep 17 00:00:00 2001
From: Tails developers <tails@boum.org>
Date: Tue, 23 Oct 2012 18:44:27 +0200
Subject: Do not enforce permissions when manage_incoming_conf is false

---
 manifests/init.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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"
     }
   }
-- 
cgit v1.2.3