[Mageia-sysadm] [875] deploy our README on the mirror

root at mageia.org root at mageia.org
Fri Jan 21 15:16:20 CET 2011


Revision: 875
Author:   misc
Date:     2011-01-21 15:16:20 +0100 (Fri, 21 Jan 2011)
Log Message:
-----------
deploy our README on the mirror

Modified Paths:
--------------
    puppet/deployment/main_mirror/manifests/init.pp
    puppet/manifests/nodes.pp

Modified: puppet/deployment/main_mirror/manifests/init.pp
===================================================================
--- puppet/deployment/main_mirror/manifests/init.pp	2011-01-21 14:10:27 UTC (rev 874)
+++ puppet/deployment/main_mirror/manifests/init.pp	2011-01-21 14:16:20 UTC (rev 875)
@@ -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,

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2011-01-21 14:10:27 UTC (rev 874)
+++ puppet/manifests/nodes.pp	2011-01-21 14:16:20 UTC (rev 875)
@@ -11,7 +11,7 @@
     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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110121/11fc3364/attachment.html>


More information about the Mageia-sysadm mailing list