aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-08 14:47:10 +0000
committerMichael Scherer <misc@mageia.org>2012-01-08 14:47:10 +0000
commit7eeccd04686d9c28f75e5aae337e354c02a9e8f9 (patch)
tree6714641c3626c62a2b32acd8463b17e86ee9791e /modules
parent81d5aeaf9407a82cf0bccd7c5f3c4bf64ed96365 (diff)
downloadpuppet-7eeccd04686d9c28f75e5aae337e354c02a9e8f9.tar
puppet-7eeccd04686d9c28f75e5aae337e354c02a9e8f9.tar.gz
puppet-7eeccd04686d9c28f75e5aae337e354c02a9e8f9.tar.bz2
puppet-7eeccd04686d9c28f75e5aae337e354c02a9e8f9.tar.xz
puppet-7eeccd04686d9c28f75e5aae337e354c02a9e8f9.zip
merge the 2 declarations of directory ( ordering is automatic )
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/manifests/init.pp7
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index e37b09b7..9031b9cb 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -42,15 +42,10 @@ class buildsystem {
}
$location = "/var/www/bs"
- file { "$location":
+ file { ["$location","$location/data"]:
ensure => directory,
}
- file { "$location/data":
- ensure => directory,
- require => File[$location],
- }
-
apache::vhost_base { "pkgsubmit.$domain":
aliases => { "/uploads" => "$sched_home_dir/uploads" },
location => $location,