diff options
| author | Tails developers <tails@boum.org> | 2012-10-23 17:22:24 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-10-25 14:29:53 +0200 |
| commit | 7d8df54c88f2149e0ba47d4d9ca4b85ef0a3a528 (patch) | |
| tree | 68e163cbab5298d4ee5095e1a80cf07a15c9d49b /manifests | |
| parent | 4ed9def99c99a6d5c21af18eb0b73a1d6081cbee (diff) | |
Reduce duplication by using defaults for File resources
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 31 |
1 files changed, 17 insertions, 14 deletions
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" } } |