From 93da31439ab2fee7de4412c86622d5f0c84cf376 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 19 Mar 2012 16:46:00 +0000
Subject: split mirror classes into separate file

---
 modules/mirror/manifests/init.pp          | 34 -------------------------------
 modules/mirror/manifests/mageia.pp        |  7 +++++++
 modules/mirror/manifests/main.pp          | 14 +++++++++++++
 modules/mirror/manifests/mdv2010spring.pp |  7 +++++++
 modules/mirror/manifests/newrelease.pp    |  7 +++++++
 5 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 modules/mirror/manifests/mageia.pp
 create mode 100644 modules/mirror/manifests/main.pp
 create mode 100644 modules/mirror/manifests/mdv2010spring.pp
 create mode 100644 modules/mirror/manifests/newrelease.pp

(limited to 'modules')

diff --git a/modules/mirror/manifests/init.pp b/modules/mirror/manifests/init.pp
index b9a245bb..99289e05 100644
--- a/modules/mirror/manifests/init.pp
+++ b/modules/mirror/manifests/init.pp
@@ -39,38 +39,4 @@ class mirror {
         }
     }
 
-    # For main Mageia mirror
-    class main inherits base {
-        local_script { "update_timestamp":
-            content => template("mirror/update_timestamp")
-        }
-
-        cron { mirror:
-            user => mirror,
-            minute => '*/10',
-            command => "/usr/local/bin/update_timestamp",
-            require => [Local_script["update_timestamp"], User['mirror']],
-        }
-    }
-
-    class mageia inherits base {
-    	mirrordir { "mageia":
-            remoteurl => "rsync://rsync.$domain/mageia",
-            localdir => '/distrib/mageia',
-        }
-    }
-
-    class newrelease inherits base {
-    	mirrordir { "newrelease":
-            remoteurl => "rsync://rsync.$domain/newrelease",
-            localdir => '/distrib/newrelease',
-	    }
-    }
-
-    class mdv2010spring inherits base {
-    	mirrordir { "mdv2010.1":
-            remoteurl => "rsync://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1",
-            localdir => '/distrib/mandriva/',
-        }
-    }
 }
diff --git a/modules/mirror/manifests/mageia.pp b/modules/mirror/manifests/mageia.pp
new file mode 100644
index 00000000..e3e4d9b1
--- /dev/null
+++ b/modules/mirror/manifests/mageia.pp
@@ -0,0 +1,7 @@
+class mirror::mageia {
+    include mirrors::base
+    mirrordir { 'mageia':
+        remoteurl => "rsync://rsync.$::domain/mageia",
+        localdir  => '/distrib/mageia',
+    }
+}
diff --git a/modules/mirror/manifests/main.pp b/modules/mirror/manifests/main.pp
new file mode 100644
index 00000000..7aadd7fd
--- /dev/null
+++ b/modules/mirror/manifests/main.pp
@@ -0,0 +1,14 @@
+# For main Mageia mirror
+class mirror::main {
+    include mirror::base
+    local_script { 'update_timestamp':
+        content => template('mirror/update_timestamp')
+    }
+
+    cron { 'mirror':
+        user    => 'mirror',
+        minute  => '*/10',
+        command => '/usr/local/bin/update_timestamp',
+        require => [Local_script['update_timestamp'], User['mirror']],
+    }
+}
diff --git a/modules/mirror/manifests/mdv2010spring.pp b/modules/mirror/manifests/mdv2010spring.pp
new file mode 100644
index 00000000..51a67284
--- /dev/null
+++ b/modules/mirror/manifests/mdv2010spring.pp
@@ -0,0 +1,7 @@
+class mirror::mdv2010spring {
+    include mirror::base
+    mirrordir { 'mdv2010.1':
+        remoteurl => 'rsync://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1',
+        localdir  => '/distrib/mandriva/',
+    }
+}
diff --git a/modules/mirror/manifests/newrelease.pp b/modules/mirror/manifests/newrelease.pp
new file mode 100644
index 00000000..49ae4b43
--- /dev/null
+++ b/modules/mirror/manifests/newrelease.pp
@@ -0,0 +1,7 @@
+class mirror::newrelease {
+    include mirror::base
+    mirrordir { 'newrelease':
+        remoteurl => "rsync://rsync.$::domain/newrelease",
+        localdir  => '/distrib/newrelease',
+    }
+}
-- 
cgit v1.2.1