[Mageia-sysadm] [828] split mirror class in mirror::base and mirror::main

[root at mageia.org]

Revision: 828
Author:   boklm
Date:     2011-01-18 16:10:30 +0100 (Tue, 18 Jan 2011)
Log Message:
-----------
split mirror class in mirror::base and mirror::main

Modified Paths:
--------------
    puppet/manifests/nodes.pp
    puppet/modules/mirror/manifests/init.pp

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2011-01-18 14:29:51 UTC (rev 827)
+++ puppet/manifests/nodes.pp	2011-01-18 15:10:30 UTC (rev 828)
@@ -11,7 +11,7 @@
     include default_mageia_server
     timezone::timezone { "Europe/Paris": }
     include rsyncd
-    include mirror
+    include mirror::main
     include openldap::master 
     include subversion::client
     include subversion::server

Modified: puppet/modules/mirror/manifests/init.pp
===================================================================
--- puppet/modules/mirror/manifests/init.pp	2011-01-18 14:29:51 UTC (rev 827)
+++ puppet/modules/mirror/manifests/init.pp	2011-01-18 15:10:30 UTC (rev 828)
@@ -1,40 +1,42 @@
 class mirror {
+    class base {
+	file { "/home/mirror/bin/":
+	    ensure => directory,
+            owner => mirror,
+	    group => mirror,
+	    mode => 755
+	}
 
-    file { "update_timestamp":
-        path => "/home/mirror/bin/update_timestamp",
-        ensure => present,
-        owner => mirror,
-        group => mirror,
-        mode => 755,
-        content => template("mirror/update_timestamp")
-    }
+	group {"mirror":
+	    ensure => present,
+	}
 
-    file { "/home/mirror/bin/":
-        ensure => directory,
-        owner => mirror,
-        group => mirror,
-        mode => 755
+	user {"mirror":
+	    ensure => present,
+		   comment => "System user use to run mirror scripts",
+		   managehome => true,
+		   gid => mirror,
+		   shell => "/bin/bash",
+	}
     }
 
-    group {"mirror":
-        ensure => present,
-    }
+    # For main Mageia mirror
+    class main inherits base {
+	file { "update_timestamp":
+	    path => "/home/mirror/bin/update_timestamp",
+	    ensure => present,
+	    owner => mirror,
+	    group => mirror,
+	    mode => 755,
+	    content => template("mirror/update_timestamp")
+	}
 
-    user {"mirror":
-        ensure => present,
-        comment => "System user use to run mirror scripts",
-        managehome => true,
-        gid => mirror,
-        shell => "/bin/bash",
+	cron { mirror:
+	    user => mirror,
+	    hour => 10,
+	    minute => 14,
+	    command => "~mirror/bin/update_timestamp",
+	    require => File["update_timestamp"],
+	}
     }
-
-
-    cron { mirror:
-        user => mirror,
-        hour => 10,
-        minute => 14,
-        command => "~mirror/bin/update_timestamp",
-        require => File["update_timestamp"],
-    }
-
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110118/40947b3a/attachment.html>