Rename some classes to work with Puppet >= 4

9 files changed, 16 insertions, 25 deletions

diff --git a/manifests/nodes/duvel.pp b/manifests/nodes/duvel.pp
index 772e43dc..e7dafa45 100644
--- a/manifests/nodes/duvel.pp
+++ b/manifests/nodes/duvel.pp
@@ -36,7 +36,7 @@ node duvel {
     include websites::svn
     include websites::git
 
-    class { 'mga-advisories':
+    class { 'mga_advisories':
         vhost => "advisories.${::domain}",
     }
 
diff --git a/manifests/nodes/rabbit.pp b/manifests/nodes/rabbit.pp
index 245acce0..9a630dbc 100644
--- a/manifests/nodes/rabbit.pp
+++ b/manifests/nodes/rabbit.pp
@@ -16,10 +16,10 @@ node rabbit {
     # include mirror::mageia
     include releasekey
 
-    youri-check::config {'config_cauldron':
+    youri_check::config {'config_cauldron':
         version => 'cauldron',
     }
-    youri-check::check {'check_cauldron':
+    youri_check::check {'check_cauldron':
         version => 'cauldron',
         minute  => 30
     }
diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp
index f9cc47d8..8f634140 100644
--- a/manifests/nodes/sucuk.pp
+++ b/manifests/nodes/sucuk.pp
@@ -58,34 +58,34 @@ node sucuk {
         maintdburl  => "https://pkgsubmit.${::domain}/data/maintdb.txt",
     }
 
-    class { 'mga-treasurer':
+    class { 'mga_treasurer':
         vhost    => "treasurer.${::domain}",
         vhostdir => "/var/www/vhosts/treasurer.${::domain}",
     }
 
-    youri-check::report_www { 'check': }
+    youri_check::report_www { 'check': }
 
-    youri-check::createdb_user {'config_cauldron':
+    youri_check::createdb_user {'config_cauldron':
         version => 'cauldron',
     }
 
-    youri-check::config {'config_cauldron':
+    youri_check::config {'config_cauldron':
         version => 'cauldron',
     }
-    youri-check::report { 'report_cauldron':
+    youri_check::report { 'report_cauldron':
         version => 'cauldron',
         minute  => '0'
     }
 
-    youri-check::createdb_user {'config_9':
+    youri_check::createdb_user {'config_9':
         version => '9',
     }
 
-    youri-check::config {'config_9':
+    youri_check::config {'config_9':
         version => '9',
     }
 
-    youri-check::report {'report_9':
+    youri_check::report {'report_9':
         version => '9',
         hour    => '*/4',
         minute  => '56'
diff --git a/modules/apache/manifests/cve-2011-3192.pp b/modules/apache/manifests/cve-2011-3192.pp
deleted file mode 100644
index 1e39ac04..00000000
--- a/modules/apache/manifests/cve-2011-3192.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class apache::cve-2011-3192 {
-    include apache::base
-    # temporary protection against CVE-2011-3192
-    # https://httpd.apache.org/security/CVE-2011-3192.txt
-    apache::config {
-        "${apache::base::conf_d}/CVE-2011-3192.conf":
-          content => template('apache/CVE-2011-3192.conf'),
-    }
-}
diff --git a/modules/bugzilla-dev/manifests/init.pp b/modules/bugzilla-dev/manifests/init.pp
index c6623872..b59cbdb7 100755
--- a/modules/bugzilla-dev/manifests/init.pp
+++ b/modules/bugzilla-dev/manifests/init.pp
@@ -1,4 +1,4 @@
-class bugzilla-dev {
+class bugzilla_dev {
 
     $bugzilla_dev_location = '/usr/share/bugzilla/'
 
diff --git a/modules/mga-advisories/manifests/init.pp b/modules/mga-advisories/manifests/init.pp
index 1937bb62..8e64b516 100644
--- a/modules/mga-advisories/manifests/init.pp
+++ b/modules/mga-advisories/manifests/init.pp
@@ -1,4 +1,4 @@
-class mga-advisories(
+class mga_advisories(
   $advisories_svn = "svn://svn.${::domain}/svn/advisories",
   $vhost
 ){
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index 4b8b5552..b7b27741 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -1,4 +1,4 @@
-class mga-mirrors {
+class mga_mirrors {
 
     $vhost = "mirrors.${::domain}"
     $mirrors_dir = '/var/www/mirrors'
diff --git a/modules/mga-treasurer/manifests/init.pp b/modules/mga-treasurer/manifests/init.pp
index d092e982..a0a63aa0 100644
--- a/modules/mga-treasurer/manifests/init.pp
+++ b/modules/mga-treasurer/manifests/init.pp
@@ -1,4 +1,4 @@
-class mga-treasurer(
+class mga_treasurer(
   $grisbi_git = "git://git.${::domain}/org/accounts",
   $grisbi_filename = 'mageia-accounts.gsb',
   $vhost,
diff --git a/modules/spec-tree-reports/manifests/init.pp b/modules/spec-tree-reports/manifests/init.pp
index dc78ea72..6fa409e2 100644
--- a/modules/spec-tree-reports/manifests/init.pp
+++ b/modules/spec-tree-reports/manifests/init.pp
@@ -2,7 +2,7 @@
 # in the repository versus the versions created by the latest spec files and
 # shows those that don't match.
 
-class spec-tree-reports(
+class spec_tree_reports(
     $report = '/var/www/bs/spec-rpm-mismatch.html',
     $srpms = 'file:///distrib/bootstrap/distrib/{version}/SRPMS/{media}/{section}/',
     $release = "mga${buildsystem::var::distros::distros['cauldron']['version']}",