From 38312b860a4ea9809194e8aa1832e6c9d3884605 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Tue, 7 Jun 2011 01:29:14 +0000 Subject: drop the "mirror" prefix of the class, as it is already n the module name --- manifests/nodes.pp | 6 +++--- modules/mirror/manifests/init.pp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/nodes.pp b/manifests/nodes.pp index e9220a8b..1eac79a9 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -34,7 +34,7 @@ node valstar { # whole module ( see r698 ) #include openssh::ssh_keys_from_ldap - include mirror::mirrormdv2010spring + include mirror::mdv2010spring include repositories::subversion include repositories::git @@ -216,8 +216,8 @@ node rabbit { include draklive::base include access_classes::iso_makers include openssh::ssh_keys_from_ldap - include mirror::mirrormageia - include mirror::mirrornewrelease + include mirror::mageia + include mirror::newrelease include releasekey::base include youri-check::check diff --git a/modules/mirror/manifests/init.pp b/modules/mirror/manifests/init.pp index 21ef7472..6f6b3c26 100644 --- a/modules/mirror/manifests/init.pp +++ b/modules/mirror/manifests/init.pp @@ -74,21 +74,21 @@ class mirror { } } - class mirrormageia inherits base { + class mageia inherits base { mirrordir { "mageia": remoteurl => "rsync://rsync.$domain/mageia", localdir => '/distrib/mageia', } } - class mirrornewrelease inherits base { + class newrelease inherits base { mirrordir { "newrelease": remoteurl => "rsync://rsync.$domain/newrelease", localdir => '/distrib/newrelease', } } - class mirrormdv2010spring inherits base { + class mdv2010spring inherits base { mirrordir { "mdv2010.1": remoteurl => "rsync://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1", localdir => '/distrib/mandriva/', -- cgit v1.2.1