From dca386b40c22892245e0a8b9b6ab4853fca1412a Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 27 Jun 2012 12:18:10 -0400
Subject: switch to 2.7 requirement of underscores instead of hyphens

---
 manifests/base.pp         |  6 +++---
 manifests/centos.pp       |  6 +++---
 manifests/config/file.pp  | 10 +++++-----
 manifests/expire.pp       |  4 ++--
 manifests/expire/mysql.pp |  4 ++--
 manifests/quota.pp        |  2 +-
 manifests/sieve.pp        | 12 ++++++------
 manifests/sql.pp          | 12 ++++++------
 8 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/manifests/base.pp b/manifests/base.pp
index 949935e..455e286 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,9 +1,9 @@
 class dovecot::base {
   
   file { '/etc/dovecot.conf':
-    source => [ "puppet:///modules/site-dovecot/config/${fqdn}/dovecot.conf",
-                "puppet:///modules/site-dovecot/config/${dovecot::type}/dovecot.conf",
-                "puppet:///modules/site-dovecot/config/dovecot.conf",
+    source => [ "puppet:///modules/site_dovecot/config/${fqdn}/dovecot.conf",
+                "puppet:///modules/site_dovecot/config/${dovecot::type}/dovecot.conf",
+                "puppet:///modules/site_dovecot/config/dovecot.conf",
                 "puppet:///modules/dovecot/config/${operatingsystem}/dovecot.conf",
                 "puppet:///modules/dovecot/config/dovecot.conf" ],
     require => Package['dovecot'],
diff --git a/manifests/centos.pp b/manifests/centos.pp
index 22caab3..43c4f00 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -1,9 +1,9 @@
 class dovecot::centos inherits dovecot::base {
 
   file { '/etc/sysconfig/dovecot':
-    source => [ "puppet:///modules/site-dovecot/sysconfig/${fqdn}/dovecot",
-                "puppet:///modules/site-dovecot/sysconfig/${dovecot::type}/dovecot",
-                "puppet:///modules/site-dovecot/sysconfig/dovecot",
+    source => [ "puppet:///modules/site_dovecot/sysconfig/${fqdn}/dovecot",
+                "puppet:///modules/site_dovecot/sysconfig/${dovecot::type}/dovecot",
+                "puppet:///modules/site_dovecot/sysconfig/dovecot",
                 "puppet:///modules/dovecot/sysconfig/dovecot" ],
     require => Package['dovecot'],
     notify => Service['dovecot'],
diff --git a/manifests/config/file.pp b/manifests/config/file.pp
index 39c6cc3..0fe777f 100644
--- a/manifests/config/file.pp
+++ b/manifests/config/file.pp
@@ -45,15 +45,15 @@ define dovecot::config::file (
    # the $content variable is 'absent' by default, so if the user doesn't
    # specify anything for $content, then the following will be used, searching
    # from the first source line until a file is found that matches. We use the
-   # standard search prioritizing the site-dovecot module first
+   # standard search prioritizing the site_dovecot module first
    case $content {
      'absent': {
        $real_source = $source ? {
          'absent' => [
-                      "puppet:///modules/site-dovecot/config/${fqdn}/${name}",
-                      "puppet:///modules/site-dovecot/config/${operatingsystem}/${lsbdistcodename}/${name}",
-                      "puppet:///modules/site-dovecot/config/${operatingsystem}/${name}",
-                      "puppet:///modules/site-dovecot/config/${name}",
+                      "puppet:///modules/site_dovecot/config/${fqdn}/${name}",
+                      "puppet:///modules/site_dovecot/config/${operatingsystem}/${lsbdistcodename}/${name}",
+                      "puppet:///modules/site_dovecot/config/${operatingsystem}/${name}",
+                      "puppet:///modules/site_dovecot/config/${name}",
                       "puppet:///modules/dovecot/config/${operatingsystem}/${lsbdistcodename}/${name}",
                       "puppet:///modules/dovecot/config/${operatingsystem}/${name}",
                       "puppet:///modules/dovecot/config/${name}"
diff --git a/manifests/expire.pp b/manifests/expire.pp
index c0cf8b9..bd1a043 100644
--- a/manifests/expire.pp
+++ b/manifests/expire.pp
@@ -50,8 +50,8 @@ class dovecot::expire ( $type = 'sqlite', $mail_location = '', $dirs = '', $days
   
   if $type != 'legacy' and $type != 'mysql' and $version != 2 {
     file{'/etc/dovecot-expire.conf':
-      source => [ "puppet:///modules/site-dovecot/expire/${fqdn}/dovecot-expire.conf",
-                  "puppet:///modules/site-dovecot/expire/dovecot-expire.conf",
+      source => [ "puppet:///modules/site_dovecot/expire/${fqdn}/dovecot-expire.conf",
+                  "puppet:///modules/site_dovecot/expire/dovecot-expire.conf",
                   "puppet:///modules/dovecot/expire/${operatingsystem}/dovecot-expire.conf",
                   "puppet:///modules/dovecot/expire/dovecot-expire.conf" ],
       require => Package['dovecot'],
diff --git a/manifests/expire/mysql.pp b/manifests/expire/mysql.pp
index aa9d1bd..5256d60 100644
--- a/manifests/expire/mysql.pp
+++ b/manifests/expire/mysql.pp
@@ -1,8 +1,8 @@
 class dovecot::expire::mysql {
 
   file { 'dovecot-dict-expire.conf':
-    source => [ "puppet:///modules/site-dovecot/expire/${fqdn}/mysql-dict-expire.conf",
-                "puppet:///modules/site-dovecot/expire/mysql-dict-expire.conf",
+    source => [ "puppet:///modules/site_dovecot/expire/${fqdn}/mysql-dict-expire.conf",
+                "puppet:///modules/site_dovecot/expire/mysql-dict-expire.conf",
                 "puppet:///modules/dovecot/expire/${operatingsystem}/mysql-dict-expire.conf",
                 "puppet:///modules/dovecot/expire/mysql-dict-expire.conf" ],
     path => $operatingsystem ? {
diff --git a/manifests/quota.pp b/manifests/quota.pp
index a36fac0..6bd1ea0 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -1,7 +1,7 @@
 class dovecot::quota {
 
   file { '/usr/libexec/dovecot/quota-warning.sh':
-    source => [ "puppet:///modules/site-dovecot/quota/quota-warning.sh",
+    source => [ "puppet:///modules/site_dovecot/quota/quota-warning.sh",
                 "puppet:///modules/dovecot/quota/quota-warning.sh" ],
     require => Package['dovecot'],
     before => Service['dovecot'],
diff --git a/manifests/sieve.pp b/manifests/sieve.pp
index a90a50c..740328a 100644
--- a/manifests/sieve.pp
+++ b/manifests/sieve.pp
@@ -26,8 +26,8 @@ class dovecot::sieve {
       owner => root, group => root, mode => 0644;
 
     "${sieve_location}/default.sieve":
-      source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/default.sieve",
-                  "puppet:///modules/site-dovecot/sieve/default.sieve",
+      source => [ "puppet:///modules/site_dovecot/sieve/${fqdn}/default.sieve",
+                  "puppet:///modules/site_dovecot/sieve/default.sieve",
                   "puppet:///modules/dovecot/sieve/${operatingsystem}/default.sieve",
                   "puppet:///modules/dovecot/sieve/default.sieve" ],
       notify => Exec['compile_default_sieve'],
@@ -36,8 +36,8 @@ class dovecot::sieve {
     # this is for sequential sieve scripts, configured in 90-sieve.conf as:
     #  sieve_before = /var/lib/dovecot/sieve/default.sieve
     "${sieve_location}/before.sieve":
-      source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/before.sieve",
-                  "puppet:///modules/site-dovecot/sieve/before.sieve",
+      source => [ "puppet:///modules/site_dovecot/sieve/${fqdn}/before.sieve",
+                  "puppet:///modules/site_dovecot/sieve/before.sieve",
                   "puppet:///modules/dovecot/sieve/${operatingsystem}/before.sieve",
                   "puppet:///modules/dovecot/sieve/before.sieve" ],
       notify => Exec['compile_before_sieve'],
@@ -46,8 +46,8 @@ class dovecot::sieve {
     # this is for sequential sieve scripts, configured in 90-sieve.conf as:
     #  sieve_after = /var/lib/dovecot/sieve/after.sieve
     "${sieve_location}/after.sieve":
-      source => [ "puppet:///modules/site-dovecot/sieve/${fqdn}/after.sieve",
-                  "puppet:///modules/site-dovecot/sieve/after.sieve",
+      source => [ "puppet:///modules/site_dovecot/sieve/${fqdn}/after.sieve",
+                  "puppet:///modules/site_dovecot/sieve/after.sieve",
                   "puppet:///modules/dovecot/sieve/${operatingsystem}/after.sieve",
                   "puppet:///modules/dovecot/sieve/after.sieve" ],
       notify => Exec['compile_after_sieve'],
diff --git a/manifests/sql.pp b/manifests/sql.pp
index 67b906e..3b2799c 100644
--- a/manifests/sql.pp
+++ b/manifests/sql.pp
@@ -1,9 +1,9 @@
 class dovecot::sql {
 
   file { '/etc/dovecot-sql.conf':
-    source => [ "puppet:///modules/site-dovecot/sql/${fqdn}/dovecot-sql.conf",
-                "puppet:///modules/site-dovecot/sql/${dovecot::type}/dovecot-sql.conf",
-                "puppet:///modules/site-dovecot/sql/dovecot-sql.conf",
+    source => [ "puppet:///modules/site_dovecot/sql/${fqdn}/dovecot-sql.conf",
+                "puppet:///modules/site_dovecot/sql/${dovecot::type}/dovecot-sql.conf",
+                "puppet:///modules/site_dovecot/sql/dovecot-sql.conf",
                 "puppet:///modules/site/sql/${operatingsystem}/dovecot-sql.conf",
                 "puppet:///modules/site/sql/dovecot-sql.conf" ],
     require => Package['dovecot'],
@@ -12,9 +12,9 @@ class dovecot::sql {
   }
 
   file { '/etc/dovecot-dict-sql.conf':
-    source => [ "puppet:///modules/site-dovecot/sql/${fqdn}/dovecot-dict-sql.conf",
-                "puppet:///modules/site-dovecot/sql/${dovecot::type}/dovecot-dict-sql.conf",
-                "puppet:///modules/site-dovecot/sql/dovecot-dict-sql.conf",
+    source => [ "puppet:///modules/site_dovecot/sql/${fqdn}/dovecot-dict-sql.conf",
+                "puppet:///modules/site_dovecot/sql/${dovecot::type}/dovecot-dict-sql.conf",
+                "puppet:///modules/site_dovecot/sql/dovecot-dict-sql.conf",
                 "puppet:///modules/site/sql/${operatingsystem}/dovecot-dict-sql.conf",
                 "puppet:///modules/site/sql/dovecot-dict-sql.conf" ],
     require => Package['dovecot'],
-- 
cgit v1.2.3