Switching to site_postfix convention

diff --git a/manifests/transport_regexp.pp b/manifests/transport_regexp.pp
index 7670d7d11f84c379c73f815eb31536952fd80db0..eaa78da55f1f9eef8802ebc7fc4525d8347effcf 100644 (file)
--- a/manifests/transport_regexp.pp
+++ b/manifests/transport_regexp.pp
@@ -3,7 +3,7 @@
 #
 # Manages Postfix transport_regexp by merging snippets shipped:
 # - in the module's files/transport_regexp.d/ or puppet:///files/etc/postfix/transport_regexp.d
-#   (the latter takes precedence if present); site-postfix module is supported
+#   (the latter takes precedence if present); site_postfix module is supported
 #   as well, see the source argument of file {"$postfix_transport_regexp_snippets_dir"
 #   bellow for details.
 # - via postfix::transport_regexp_snippet defines
@@ -34,8 +34,8 @@ class postfix::transport_regexp {
     group   => '0',
     mode    => '700',
     source  => [
-                "puppet:///modules/site-postfix/${fqdn}/transport_regexp.d",
-                "puppet:///modules/site-postfix/transport_regexp.d",
+                "puppet:///modules/site_postfix/${fqdn}/transport_regexp.d",
+                "puppet:///modules/site_postfix/transport_regexp.d",
                 "puppet:///files/etc/postfix/transport_regexp.d",
                 "puppet:///modules/postfix/transport_regexp.d",
                ],

diff --git a/manifests/virtual_regexp.pp b/manifests/virtual_regexp.pp
index ece3117682771cb0f3b3d9e955b0a494cf653fce..af68ec68b275b761a3c53aa97c7a8832cea14761 100644 (file)
--- a/manifests/virtual_regexp.pp
+++ b/manifests/virtual_regexp.pp
@@ -3,7 +3,7 @@
 #
 # Manages Postfix virtual_regexp by merging snippets shipped:
 # - in the module's files/virtual_regexp.d/ or puppet:///files/etc/postfix/virtual_regexp.d
-#   (the latter takes precedence if present); site-postfix module is supported
+#   (the latter takes precedence if present); site_postfix module is supported
 #   as well, see the source argument of file {"$postfix_virtual_regexp_snippets_dir"
 #   bellow for details.
 # - via postfix::virtual_regexp_snippet defines
@@ -34,8 +34,8 @@ class postfix::virtual_regexp {
     group   => '0',
     mode    => '700',
     source  => [
-                "puppet:///modules/site-postfix/${fqdn}/virtual_regexp.d",
-                "puppet:///modules/site-postfix/virtual_regexp.d",
+                "puppet:///modules/site_postfix/${fqdn}/virtual_regexp.d",
+                "puppet:///modules/site_postfix/virtual_regexp.d",
                 "puppet:///files/etc/postfix/virtual_regexp.d",
                 "puppet:///modules/postfix/virtual_regexp.d",
                ],