diff options
| -rw-r--r-- | deployment/main_mirror/manifests/init.pp | 4 | ||||
| -rw-r--r-- | deployment/main_mirror/templates/rsyncd.conf | 28 | ||||
| -rw-r--r-- | manifests/nodes.pp | 1 |
3 files changed, 32 insertions, 1 deletions
diff --git a/deployment/main_mirror/manifests/init.pp b/deployment/main_mirror/manifests/init.pp index cba61f70..8b47301f 100644 --- a/deployment/main_mirror/manifests/init.pp +++ b/deployment/main_mirror/manifests/init.pp @@ -2,6 +2,10 @@ class main_mirror { # FIXME shouldn't the various code in this module ? include mirror::main + class { rsyncd: + rsyncd_conf = 'main_mirror/rsyncd.conf' + } + $mirror = "/distrib" file { "$mirror": ensure => directory, diff --git a/deployment/main_mirror/templates/rsyncd.conf b/deployment/main_mirror/templates/rsyncd.conf new file mode 100644 index 00000000..7559d300 --- /dev/null +++ b/deployment/main_mirror/templates/rsyncd.conf @@ -0,0 +1,28 @@ +# $Id$ + +uid = nobody +gid = nogroup + +[mageia] + path = /distrib/mirror/ + comment = Mageia Mirror Tree + hosts allow = \ + rabbit.<%= domain %> \ + alamut.<%= domain %> \ + distrib-coffee.ipsl.jussieu.fr \ + distribipsl.aero.jussieu.fr \ + ibiblio.org \ + 152.46.7.122 \ + 152.19.134.16 \ + 152.19.134.30 \ + ftp.LinuxCabal.org \ + 178.22.68.98 \ + +[bootstrap] + path = /distrib/bootstrap/ + comment = Mageia Bootstrap + hosts allow = \ + rabbit.<%= domain %> \ + distrib-coffee.ipsl.jussieu.fr \ + distribipsl.aero.jussieu.fr \ + diff --git a/manifests/nodes.pp b/manifests/nodes.pp index c5bda0a6..b4313ac7 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -13,7 +13,6 @@ node valstar { # include common::default_mageia_server timezone::timezone { "Europe/Paris": } - include rsyncd include main_mirror include openldap::master include subversion::client |