Rename module paths to match classes

The refactor in commit e39155d4d changed class names but Puppet 3 seems
to require the module path name to match.

28 files changed, 25 insertions, 85 deletions

diff --git a/manifests/nodes/duvel.pp b/manifests/nodes/duvel.pp
index e7dafa45..6c03038d 100644
--- a/manifests/nodes/duvel.pp
+++ b/manifests/nodes/duvel.pp
@@ -19,7 +19,7 @@ node duvel {
     include mga_buildsystem::mainnode
     include softwarekey
     include mgasoft
-    include spec-tree-reports
+    include spec_tree_reports
 
     include access_classes::committers
     include restrictshell::allow_git
diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp
index 8f634140..251223cc 100644
--- a/manifests/nodes/sucuk.pp
+++ b/manifests/nodes/sucuk.pp
@@ -23,7 +23,7 @@ node sucuk {
     include lists
 
     include catdap
-    include mga-mirrors
+    include mga_mirrors
 
     include wikis
     include websites::perl
diff --git a/modules/bugzilla-dev/manifests/init.pp b/modules/bugzilla_dev/manifests/init.pp
index b59cbdb7..530f9a65 100755
--- a/modules/bugzilla-dev/manifests/init.pp
+++ b/modules/bugzilla_dev/manifests/init.pp
@@ -27,18 +27,18 @@ class bugzilla_dev {
     file { '/usr/share/bugzilla/localconfig':
       group   => 'apache',
       mode    => '0640',
-      content => template('bugzilla-dev/localconfig')
+      content => template('bugzilla_dev/localconfig')
     }
 
 
     file { '/usr/share/bugzilla/data/params.json':
       group   => 'apache',
       mode    => '0640',
-      content => template('bugzilla-dev/params.json')
+      content => template('bugzilla_dev/params.json')
     }
 
     apache::webapp_other { 'bugzilla-dev':
-        webapp_file => 'bugzilla-dev/webapp_bugzilla.conf',
+        webapp_file => 'bugzilla_dev/webapp_bugzilla.conf',
     }
 
     $bugs_vhost = "bugs-dev.${::domain}"
@@ -47,7 +47,7 @@ class bugzilla_dev {
     apache::vhost::redirect_ssl { $bugs_vhost: }
 
     apache::vhost::base { $bugs_vhost:
-        content  => template('bugzilla-dev/vhost.conf'),
+        content  => template('bugzilla_dev/vhost.conf'),
         aliases  => { '/bugzilla/' => $vhost_root },
         use_ssl  => true,
         location => $vhost_root,
@@ -69,7 +69,7 @@ class bugzilla_dev {
     file { '/usr/share/bugzilla/robots.txt':
       group   => 'apache',
       mode    => '0640',
-      content => template('bugzilla-dev/robots.txt')
+      content => template('bugzilla_dev/robots.txt')
     }
 
     cron { 'collectstats':
diff --git a/modules/bugzilla-dev/templates/localconfig b/modules/bugzilla_dev/templates/localconfig
index 2b7d6035..2b7d6035 100755
--- a/modules/bugzilla-dev/templates/localconfig
+++ b/modules/bugzilla_dev/templates/localconfig
diff --git a/modules/bugzilla-dev/templates/params.json b/modules/bugzilla_dev/templates/params.json
index b51b4c00..b51b4c00 100644
--- a/modules/bugzilla-dev/templates/params.json
+++ b/modules/bugzilla_dev/templates/params.json
diff --git a/modules/bugzilla-dev/templates/robots.txt b/modules/bugzilla_dev/templates/robots.txt
index 63639f02..63639f02 100755
--- a/modules/bugzilla-dev/templates/robots.txt
+++ b/modules/bugzilla_dev/templates/robots.txt
diff --git a/modules/bugzilla-dev/templates/vhost.conf b/modules/bugzilla_dev/templates/vhost.conf
index 79eab9fb..79eab9fb 100755
--- a/modules/bugzilla-dev/templates/vhost.conf
+++ b/modules/bugzilla_dev/templates/vhost.conf
diff --git a/modules/bugzilla-dev/templates/webapp_bugzilla.conf b/modules/bugzilla_dev/templates/webapp_bugzilla.conf
index a8f37a00..a8f37a00 100755
--- a/modules/bugzilla-dev/templates/webapp_bugzilla.conf
+++ b/modules/bugzilla_dev/templates/webapp_bugzilla.conf
diff --git a/modules/mga-advisories/manifests/init.pp b/modules/mga_advisories/manifests/init.pp
index 8e64b516..194e4c7d 100644
--- a/modules/mga-advisories/manifests/init.pp
+++ b/modules/mga_advisories/manifests/init.pp
@@ -31,7 +31,7 @@ class mga_advisories(
     owner   => root,
     group   => root,
     mode    => '0644',
-    content => template('mga-advisories/mga-advisories.conf'),
+    content => template('mga_advisories/mga-advisories.conf'),
     require => Package['mga-advisories'],
   }
 
@@ -71,7 +71,7 @@ class mga_advisories(
     owner   => root,
     group   => root,
     mode    => '0755',
-    content => template('mga-advisories/update_script'),
+    content => template('mga_advisories/update_script'),
   }
 
   file { $move_wrapper_script:
@@ -79,11 +79,11 @@ class mga_advisories(
     owner   => root,
     group   => root,
     mode    => '0755',
-    content => template('mga-advisories/adv-move-pkg'),
+    content => template('mga_advisories/adv-move-pkg'),
   }
 
   sudo::sudoers_config { 'mga-adv-move-pkg':
-    content => template('mga-advisories/sudoers.adv-move-pkg')
+    content => template('mga_advisories/sudoers.adv-move-pkg')
   }
 
   # Disable for now... we may re-instate once it's been a little more tested.
diff --git a/modules/mga-advisories/templates/adv-move-pkg b/modules/mga_advisories/templates/adv-move-pkg
index 71e1880e..71e1880e 100644
--- a/modules/mga-advisories/templates/adv-move-pkg
+++ b/modules/mga_advisories/templates/adv-move-pkg
diff --git a/modules/mga-advisories/templates/mga-advisories.conf b/modules/mga_advisories/templates/mga-advisories.conf
index 4dab1543..4dab1543 100644
--- a/modules/mga-advisories/templates/mga-advisories.conf
+++ b/modules/mga_advisories/templates/mga-advisories.conf
diff --git a/modules/mga-advisories/templates/sudoers.adv-move-pkg b/modules/mga_advisories/templates/sudoers.adv-move-pkg
index 5d9618a9..5d9618a9 100644
--- a/modules/mga-advisories/templates/sudoers.adv-move-pkg
+++ b/modules/mga_advisories/templates/sudoers.adv-move-pkg
diff --git a/modules/mga-advisories/templates/update_script b/modules/mga_advisories/templates/update_script
index 71d8d1d4..71d8d1d4 100644
--- a/modules/mga-advisories/templates/update_script
+++ b/modules/mga_advisories/templates/update_script
diff --git a/modules/mga-mirrors/files/check_mirrors_status b/modules/mga_mirrors/files/check_mirrors_status
index 9c00ac8d..9c00ac8d 100755
--- a/modules/mga-mirrors/files/check_mirrors_status
+++ b/modules/mga_mirrors/files/check_mirrors_status
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga_mirrors/manifests/init.pp
index b7b27741..8485f0d5 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga_mirrors/manifests/init.pp
@@ -33,12 +33,12 @@ class mga_mirrors {
     file { '/etc/mga-mirrors.ini':
         group   => 'apache',
         mode    => '0640',
-        content => template('mga-mirrors/mga-mirrors.ini'),
+        content => template('mga_mirrors/mga-mirrors.ini'),
         require => Package['mga-mirrors']
     }
 
     file { '/etc/cron.d/check_mga_mirrors':
-        content => template('mga-mirrors/cron-mga_mirrors'),
+        content => template('mga_mirrors/cron-mga_mirrors'),
         require => Package['mga-mirrors']
     }
 
@@ -49,6 +49,6 @@ class mga_mirrors {
 
     file { '/usr/local/bin/check_mirrors_status':
         mode   => '0755',
-        source => 'puppet:///modules/mga-mirrors/check_mirrors_status',
+        source => 'puppet:///modules/mga_mirrors/check_mirrors_status',
     }
 }
diff --git a/modules/mga-mirrors/templates/cron-mga_mirrors b/modules/mga_mirrors/templates/cron-mga_mirrors
index 7236be04..7236be04 100644
--- a/modules/mga-mirrors/templates/cron-mga_mirrors
+++ b/modules/mga_mirrors/templates/cron-mga_mirrors
diff --git a/modules/mga-mirrors/templates/mga-mirrors.ini b/modules/mga_mirrors/templates/mga-mirrors.ini
index b438edd1..b438edd1 100644
--- a/modules/mga-mirrors/templates/mga-mirrors.ini
+++ b/modules/mga_mirrors/templates/mga-mirrors.ini
diff --git a/modules/mga-treasurer/manifests/init.pp b/modules/mga_treasurer/manifests/init.pp
index a0a63aa0..0902ee7d 100644
--- a/modules/mga-treasurer/manifests/init.pp
+++ b/modules/mga_treasurer/manifests/init.pp
@@ -32,7 +32,7 @@ class mga_treasurer(
     owner   => root,
     group   => root,
     mode    => '0644',
-    content => template('mga-treasurer/mga-treasurer.conf'),
+    content => template('mga_treasurer/mga-treasurer.conf'),
     require => Package['mga-treasurer'],
   }
 
@@ -49,7 +49,7 @@ class mga_treasurer(
       "/${grisbi_filename}" => $grisbi_path,
       "/static"             => '/usr/share/mga-treasurer/static',
     },
-    content  => template('mga-treasurer/vhost_mga-treasurer.conf'),
+    content  => template('mga_treasurer/vhost_mga-treasurer.conf'),
     require  => File[$vhostdir],
   }
 
@@ -61,7 +61,7 @@ class mga_treasurer(
       "/${grisbi_filename}" => $grisbi_path,
       "/static"             => '/usr/share/mga-treasurer/static',
     },
-    content  => template('mga-treasurer/vhost_mga-treasurer.conf'),
+    content  => template('mga_treasurer/vhost_mga-treasurer.conf'),
     require  => File[$vhostdir],
   }
 
@@ -70,7 +70,7 @@ class mga_treasurer(
     owner   => root,
     group   => root,
     mode    => '0755',
-    content => template('mga-treasurer/update_script'),
+    content => template('mga_treasurer/update_script'),
   }
 
   git::snapshot { $grisbi_dir:
diff --git a/modules/mga-treasurer/templates/mga-treasurer.conf b/modules/mga_treasurer/templates/mga-treasurer.conf
index 75ac180f..75ac180f 100644
--- a/modules/mga-treasurer/templates/mga-treasurer.conf
+++ b/modules/mga_treasurer/templates/mga-treasurer.conf
diff --git a/modules/mga-treasurer/templates/update_script b/modules/mga_treasurer/templates/update_script
index 30fab72d..30fab72d 100644
--- a/modules/mga-treasurer/templates/update_script
+++ b/modules/mga_treasurer/templates/update_script
diff --git a/modules/mga-treasurer/templates/vhost_mga-treasurer.conf b/modules/mga_treasurer/templates/vhost_mga-treasurer.conf
index 763cd87d..763cd87d 100644
--- a/modules/mga-treasurer/templates/vhost_mga-treasurer.conf
+++ b/modules/mga_treasurer/templates/vhost_mga-treasurer.conf
diff --git a/modules/spec-tree-reports/manifests/init.pp b/modules/spec-tree-reports/manifests/init.pp
deleted file mode 100644
index 6fa409e2..00000000
--- a/modules/spec-tree-reports/manifests/init.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# spec-rpm-mismatch is a report that compares the versions of RPMs available
-# in the repository versus the versions created by the latest spec files and
-# shows those that don't match.
-
-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']}",
-) {
-    $user = 'spec-tree-reports'
-    $home = "/var/lib/${user}"
-    $hour = 6
-    $minute = 39
-
-    user { $user:
-        comment => 'spec-tree report generator',
-        home => $home,
-    }
-
-    file { $home:
-        ensure => directory,
-        owner  => $user,
-        mode   => '0755',
-    }
-
-    package { 'spec-tree':
-        ensure => installed,
-    }
-
-    file { "${report}":
-        ensure  => present,
-        owner   => $user,
-        mode    => '0644',
-        replace => false,
-        content => '*',
-    }
-
-    mga_common::local_script { 'generate-spec-rpm-mismatch-report':
-        content => template('spec-tree-reports/generate-spec-rpm-mismatch-report'),
-    }
-
-    cron { "rpm_mismatch_report":
-        command => "/usr/local/bin/generate-spec-rpm-mismatch-report |& systemd-cat -t generate-spec-rpm-mismatch-report",
-        hour    => $hour,
-        minute  => $minute,
-        user    => $user,
-        environment => "MAILTO=root",
-        require => User[$user],
-    }
-}
diff --git a/modules/spec-tree-reports/templates/generate-spec-rpm-mismatch-report b/modules/spec-tree-reports/templates/generate-spec-rpm-mismatch-report
deleted file mode 100644
index 4bc2db65..00000000
--- a/modules/spec-tree-reports/templates/generate-spec-rpm-mismatch-report
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# GENERATED BY PUPPET--DO NOT EDIT
-set -e
-trap 'test "$?" -ne 0 && echo Error in script' EXIT
-
-cd "$HOME"
-test -e errors.log && mv -f errors.log errors.log.1
-/usr/share/doc/spec-tree/examples/generate-mismatch-report --srpm_source <%= scope.function_shellquote([scope.lookupvar('srpms')]) -%> --release <%= scope.function_shellquote([scope.lookupvar('release')]) %>
-cp report.html <%= scope.function_shellquote([scope.lookupvar('report')]) %>
-rm -f report.html
diff --git a/modules/youri-check/manifests/init.pp b/modules/youri_check/manifests/init.pp
index 7447b322..98a0c95e 100644
--- a/modules/youri-check/manifests/init.pp
+++ b/modules/youri_check/manifests/init.pp
@@ -32,7 +32,7 @@ class youri_check {
 
     define config($version) {
         include stdlib
-        include youri-check::base
+        include youri_check::base
 
         $config = "/etc/youri/${version}.conf"
         $outdir = "/var/www/youri-check/${version}"
@@ -48,7 +48,7 @@ class youri_check {
             ensure  => present,
             owner   => $base::user,
             mode    => '0640',
-            content => template("youri-check/${version}.conf"),
+            content => template("youri_check/${version}.conf"),
             require => User[$base::user],
         }
     }
@@ -70,7 +70,7 @@ class youri_check {
     }
 
     define check($version, $hour = "*", $minute = 0) {
-        include youri-check::base
+        include youri_check::base
         $config = "/etc/youri/${version}.conf"
         $pgsql_server = $base::pgsql_server
         $pgsql_db = "youri_check_${version}"
@@ -96,22 +96,22 @@ class youri_check {
     }
 
     define report_www {
-        include youri-check::base
+        include youri_check::base
         $outdir = "/var/www/youri-check/"
         apache::vhost::base { $base::vhost:
             location => $outdir,
-            content => template('youri-check/vhost_check.conf'),
+            content => template('youri_check/vhost_check.conf'),
         }
         apache::vhost::base { "ssl_${base::vhost}":
             vhost    => $base::vhost,
             use_ssl  => true,
             location => $outdir,
-            content => template('youri-check/vhost_check.conf'),
+            content => template('youri_check/vhost_check.conf'),
         }
     }
 
     define report($version, $hour = "*", $minute = 20) {
-        include youri-check::base
+        include youri_check::base
 
         $config = "/etc/youri/${version}.conf"
 
diff --git a/modules/youri-check/templates/10.conf b/modules/youri_check/templates/10.conf
index c37de91d..c37de91d 100644
--- a/modules/youri-check/templates/10.conf
+++ b/modules/youri_check/templates/10.conf
diff --git a/modules/youri-check/templates/9.conf b/modules/youri_check/templates/9.conf
index 28028080..28028080 100644
--- a/modules/youri-check/templates/9.conf
+++ b/modules/youri_check/templates/9.conf
diff --git a/modules/youri-check/templates/cauldron.conf b/modules/youri_check/templates/cauldron.conf
index aeace447..aeace447 100644
--- a/modules/youri-check/templates/cauldron.conf
+++ b/modules/youri_check/templates/cauldron.conf
diff --git a/modules/youri-check/templates/vhost_check.conf b/modules/youri_check/templates/vhost_check.conf
index 2cf598b5..2cf598b5 100644
--- a/modules/youri-check/templates/vhost_check.conf
+++ b/modules/youri_check/templates/vhost_check.conf