diff options
| author | Tails developers <tails@boum.org> | 2012-10-23 18:00:04 +0200 |
|---|---|---|
| committer | Tails developers <tails@boum.org> | 2012-11-03 18:09:08 +0100 |
| commit | 50bc09183abb733cdf4da04e52340a7f5b11cf46 (patch) | |
| tree | 92265aa99c5d57f5cb4d48fd763efbbdddfd663d | |
| parent | 4177f5d276ef8135e51988e7d05a11b8fddf7a68 (diff) | |
Group related exec and file resources
| -rw-r--r-- | manifests/init.pp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 7c69680..2fc1bbb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -65,20 +65,15 @@ class reprepro ( ensure => directory, mode => '0775', } - file { "$basedir/conf/distributions": - ensure => present, - } file { "$basedir/conf/uploaders": mode => '0660', owner => root, content => template("reprepro/uploaders.erb"), } - file { "$basedir/conf/incoming": - ensure => present, - } file { "$basedir/index.html": mode => '0664', owner => root, content => template("reprepro/index.html.erb"), } + file { "$basedir/.gnupg": mode => '0700', ensure => directory, @@ -94,7 +89,17 @@ class reprepro ( group => root, mode => '0755', } + exec { "/usr/local/bin/reprepro-export-key": + creates => "$basedir/key.asc", + user => reprepro, + subscribe => File["$basedir/.gnupg/secring.gpg"], + require => File["/usr/local/bin/reprepro-export-key"], + } + + file { "$basedir/conf/distributions": + ensure => present, + } if $manage_distributions_conf { File["$basedir/conf/distributions"] { owner => root, @@ -116,6 +121,9 @@ class reprepro ( } } + file { "$basedir/conf/incoming": + ensure => present, + } if $manage_incoming_conf { File["$basedir/conf/incoming"] { mode => '0664', @@ -178,14 +186,6 @@ class reprepro ( File["$basedir/incoming"] ], } - exec { - "/usr/local/bin/reprepro-export-key": - creates => "$basedir/key.asc", - user => reprepro, - subscribe => File["$basedir/.gnupg/secring.gpg"], - require => File["/usr/local/bin/reprepro-export-key"], - } - # TODO: setup needeed lines in apache site config file } |