split mirror class in mirror::base and mirror::main

2 files changed, 35 insertions, 33 deletions

diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 79b40af2..8c59a173 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
+    include mirror::main
     include openldap::master 
     include subversion::client
     include subversion::server
diff --git a/modules/mirror/manifests/init.pp b/modules/mirror/manifests/init.pp
index 512b0463..5a752f81 100644
--- a/modules/mirror/manifests/init.pp
+++ b/modules/mirror/manifests/init.pp
@@ -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")
-    }
-
-    file { "/home/mirror/bin/":
-        ensure => directory,
-        owner => mirror,
-        group => mirror,
-        mode => 755
-    }
+	group {"mirror":
+	    ensure => present,
+	}
 
-    group {"mirror":
-        ensure => present,
-    }
-
-    user {"mirror":
-        ensure => present,
-        comment => "System user use to run mirror scripts",
-        managehome => true,
-        gid => mirror,
-        shell => "/bin/bash",
+	user {"mirror":
+	    ensure => present,
+		   comment => "System user use to run mirror scripts",
+		   managehome => true,
+		   gid => mirror,
+		   shell => "/bin/bash",
+	}
     }
 
+    # 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")
+	}
 
-    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"],
+	}
     }
-
 }