From 7d8df54c88f2149e0ba47d4d9ca4b85ef0a3a528 Mon Sep 17 00:00:00 2001
From: Tails developers <tails@boum.org>
Date: Tue, 23 Oct 2012 17:22:24 +0200
Subject: Reduce duplication by using defaults for File resources

---
 manifests/init.pp | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index ebf8a91..f0fdd5c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -32,59 +32,64 @@ class reprepro (
     }
   }
 
+  File {
+    owner => reprepro,
+    group => reprepro,
+  }
+
   file {
     "$basedir":
     ensure => directory,
-    mode => $basedir_mode, owner => reprepro, group => reprepro;
+    mode => $basedir_mode;
 
     "$basedir/conf":
     ensure => directory,
-    mode => 0770, owner => root, group => reprepro;
+    mode => 0770;
 
     "$basedir/db":
     ensure => directory,
-    mode => 0770, owner => reprepro, group => reprepro;
+    mode => 0770;
 
     "$basedir/dists":
     ensure => directory,
-    mode => 0775, owner => reprepro, group => reprepro;
+    mode => 0775;
 
     "$basedir/pool":
     ensure => directory,
-    mode => 0775, owner => reprepro, group => reprepro;
+    mode => 0775;
 
     "$basedir/incoming":
     ensure => directory,
-    mode => $incoming_mode, owner => reprepro, group => reprepro;
+    mode => $incoming_mode;
 
     "$basedir/logs":
     ensure => directory,
-    mode => 0775, owner => reprepro, group => reprepro;
+    mode => 0775;
 
     "$basedir/tmp":
     ensure => directory,
-    mode => 0775, owner => reprepro, group => reprepro;
+    mode => 0775;
 
     "$basedir/conf/distributions":
     ensure => present;
 
     "$basedir/conf/uploaders":
-    mode => 0660, owner => root, group => reprepro,
+    mode => 0660, owner => root,
     content => template("reprepro/uploaders.erb");
 
     "$basedir/conf/incoming":
     ensure => present;
 
     "$basedir/index.html":
-    mode => 0664, owner => root, group => reprepro,
+    mode => 0664, owner => root,
     content => template("reprepro/index.html.erb");
 
     "$basedir/.gnupg":
-    mode => 700, owner => reprepro, group => reprepro,
+    mode => 700,
     ensure => directory;
 
     "$basedir/.gnupg/secring.gpg":
-    mode => 600, owner => reprepro, group => reprepro,
+    mode => 600,
     ensure => present;
 
     "/usr/local/bin/reprepro-export-key":
@@ -98,7 +103,6 @@ class reprepro (
   if $manage_distributions_conf {
     File["$basedir/conf/distributions"] {
       owner   => root,
-      group   => reprepro,
       mode    => 0664,
       content => template("reprepro/distributions.erb"),
     }
@@ -121,7 +125,6 @@ class reprepro (
     File["$basedir/conf/incoming"] {
       mode => 0664,
       owner => root,
-      group => reprepro,
       source => "puppet://$server/modules/reprepro/incoming"
     }
   }
-- 
cgit v1.2.3