aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-01-21 14:16:20 +0000
committerMichael Scherer <misc@mageia.org>2011-01-21 14:16:20 +0000
commit5a91945ff0467ccae13b189634381205b9fb95d9 (patch)
treed34d50a8d63cfc6cadec5ed6b10f254f81c25cdb
parentcdab0482c0d69f757b5edea4563bf6fc345a240f (diff)
downloadpuppet-5a91945ff0467ccae13b189634381205b9fb95d9.tar
puppet-5a91945ff0467ccae13b189634381205b9fb95d9.tar.gz
puppet-5a91945ff0467ccae13b189634381205b9fb95d9.tar.bz2
puppet-5a91945ff0467ccae13b189634381205b9fb95d9.tar.xz
puppet-5a91945ff0467ccae13b189634381205b9fb95d9.zip
deploy our README on the mirror
-rw-r--r--deployment/main_mirror/manifests/init.pp3
-rw-r--r--manifests/nodes.pp2
2 files changed, 4 insertions, 1 deletions
diff --git a/deployment/main_mirror/manifests/init.pp b/deployment/main_mirror/manifests/init.pp
index cb00d180..c02ca26e 100644
--- a/deployment/main_mirror/manifests/init.pp
+++ b/deployment/main_mirror/manifests/init.pp
@@ -1,4 +1,7 @@
class main_mirror {
+ # FIXME shouldn't the various code in this module ?
+ include mirror::main
+
$mirror = "/distrib"
file { "$mirror":
ensure => directory,
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index ee3dc81f..3a73a36f 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -11,7 +11,7 @@ node valstar {
include default_mageia_server
timezone::timezone { "Europe/Paris": }
include rsyncd
- include mirror::main
+ include main_mirror
include openldap::master
include subversion::client
include subversion::server