aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mirror
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-19 16:46:00 +0000
committerMichael Scherer <misc@mageia.org>2012-03-19 16:46:00 +0000
commit93da31439ab2fee7de4412c86622d5f0c84cf376 (patch)
tree56c79ad53b93bfe1064497a368b035fa9201cc91 /modules/mirror
parent0c0d54460c4f817f5111d3a131e1e9277e98c242 (diff)
downloadpuppet-93da31439ab2fee7de4412c86622d5f0c84cf376.tar
puppet-93da31439ab2fee7de4412c86622d5f0c84cf376.tar.gz
puppet-93da31439ab2fee7de4412c86622d5f0c84cf376.tar.bz2
puppet-93da31439ab2fee7de4412c86622d5f0c84cf376.tar.xz
puppet-93da31439ab2fee7de4412c86622d5f0c84cf376.zip
split mirror classes into separate file
Diffstat (limited to 'modules/mirror')
-rw-r--r--modules/mirror/manifests/init.pp34
-rw-r--r--modules/mirror/manifests/mageia.pp7
-rw-r--r--modules/mirror/manifests/main.pp14
-rw-r--r--modules/mirror/manifests/mdv2010spring.pp7
-rw-r--r--modules/mirror/manifests/newrelease.pp7
5 files changed, 35 insertions, 34 deletions
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',
+ }
+}