convert exim module to new syntax - why it needs to change, I don't know

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index d7229bc..5bf93fe 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -55,28 +55,28 @@ class exim {
           ;
         "/etc/exim4/host_blacklist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/host_blacklist",
-                       "puppet:///exim/common/host_blacklist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/host_blacklist",
+                       "puppet:///modules/exim/common/host_blacklist" ]
           ;
         "/etc/exim4/blacklist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
-                       "puppet:///exim/common/blacklist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/blacklist",
+                       "puppet:///modules/exim/common/blacklist" ]
           ;
         "/etc/exim4/callout_users":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/callout_users",
-                       "puppet:///exim/common/callout_users" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/callout_users",
+                       "puppet:///modules/exim/common/callout_users" ]
           ;
         "/etc/exim4/grey_users":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/grey_users",
-                       "puppet:///exim/common/grey_users" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/grey_users",
+                       "puppet:///modules/exim/common/grey_users" ]
           ;
         "/etc/exim4/helo-check":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
-                       "puppet:///exim/common/helo-check" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/helo-check",
+                       "puppet:///modules/exim/common/helo-check" ]
           ;
         "/etc/exim4/locals":
           require => Package["exim4-daemon-heavy"],
@@ -84,18 +84,18 @@ class exim {
           ;
         "/etc/exim4/localusers":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/localusers",
-                       "puppet:///exim/common/localusers" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/localusers",
+                       "puppet:///modules/exim/common/localusers" ]
           ;
         "/etc/exim4/rbllist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
-                       "puppet:///exim/common/rbllist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/rbllist",
+                       "puppet:///modules/exim/common/rbllist" ]
           ;
         "/etc/exim4/rhsbllist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
-                       "puppet:///exim/common/rhsbllist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/rhsbllist",
+                       "puppet:///modules/exim/common/rhsbllist" ]
           ;
         "/etc/exim4/virtualdomains":
           require => Package["exim4-daemon-heavy"],
@@ -103,48 +103,48 @@ class exim {
           ;
         "/etc/exim4/whitelist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/whitelist",
-                       "puppet:///exim/common/whitelist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/whitelist",
+                       "puppet:///modules/exim/common/whitelist" ]
           ;
         "/etc/exim4/submission-domains":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/submission-domains",
-                       "puppet:///exim/common/submission-domains" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/submission-domains",
+                       "puppet:///modules/exim/common/submission-domains" ]
           ;
         "/etc/logrotate.d/exim4-base":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-base",
-                       "puppet:///exim/common/logrotate-exim4-base" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/logrotate-exim4-base",
+                       "puppet:///modules/exim/common/logrotate-exim4-base" ]
           ;
         "/etc/logrotate.d/exim4-paniclog":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
-                       "puppet:///exim/common/logrotate-exim4-paniclog" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/logrotate-exim4-paniclog",
+                       "puppet:///modules/exim/common/logrotate-exim4-paniclog" ]
           ;
         "/etc/exim4/ssl/thishost.crt":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/$fqdn.crt",
+          source  => "puppet:///modules/exim/certs/$fqdn.crt",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/thishost.key":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/$fqdn.key",
+          source  => "puppet:///modules/exim/certs/$fqdn.key",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/ca.crt":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/ca.crt",
+          source  => "puppet:///modules/exim/certs/ca.crt",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/ca.crl":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/ca.crl",
+          source  => "puppet:///modules/exim/certs/ca.crl",
           owner   => root,
           group   => Debian-exim,
           mode    => 640

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 3909f9b..8a81592 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -5,15 +5,15 @@ class exim::mx inherits exim {
     file {
         "/etc/exim4/ccTLD.txt":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/ccTLD.txt" ]
+          source  => [ "puppet:///modules/exim/common/ccTLD.txt" ]
           ;
         "/etc/exim4/surbl_whitelist.txt":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/surbl_whitelist.txt" ]
+          source  => [ "puppet:///modules/exim/common/surbl_whitelist.txt" ]
           ;
         "/etc/exim4/exim_surbl.pl":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/exim_surbl.pl" ],
+          source  => [ "puppet:///modules/exim/common/exim_surbl.pl" ],
           notify  => Exec["exim4 restart"]
           ;
     }