From 2a4ae58cc5e3f6e4a1e09ef6a9f15ade1e2c59fa Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 10 Oct 2013 18:53:13 +0200
Subject: move site_config::checks to site_config::mx::checks

---
 puppet/modules/site_postfix/manifests/checks.pp    | 41 ----------------------
 puppet/modules/site_postfix/manifests/mx.pp        |  2 +-
 puppet/modules/site_postfix/manifests/mx/checks.pp | 41 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 puppet/modules/site_postfix/manifests/checks.pp
 create mode 100644 puppet/modules/site_postfix/manifests/mx/checks.pp

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_postfix/manifests/checks.pp b/puppet/modules/site_postfix/manifests/checks.pp
deleted file mode 100644
index 31399d32..00000000
--- a/puppet/modules/site_postfix/manifests/checks.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-class site_postfix::checks {
-
-  file {
-    '/etc/postfix/checks':
-      ensure  => directory,
-      mode    => '0755',
-      owner   => root,
-      group   => postfix,
-      require => Package['postfix'];
-
-    '/etc/postfix/checks/helo_checks':
-      content => template('site_postfix/checks/helo_access.erb'),
-      mode    => '0644',
-      owner   => root,
-      group   => root;
-  }
-
-  exec {
-    '/usr/sbin/postmap /etc/postfix/checks/helo_checks':
-      refreshonly => true,
-      subscribe   => File['/etc/postfix/checks/helo_checks'];
-  }
-
-  # Anonymize the user's home IP from the email headers (Feature #3866)
-  package { 'postfix-pcre': ensure => installed }
-
-  file { '/etc/postfix/checks/received_anon':
-    source  => 'puppet:///modules/site_postfix/checks/received_anon',
-    mode    => '0644',
-    owner   => root,
-    group   => root,
-    notify  => Service['postfix']
-  }
-
-  postfix::config {
-    'header_checks':
-      value   => 'pcre:/etc/postfix/checks/received_anon',
-      require => File['/etc/postfix/checks/received_anon'];
-  }
-
-}
diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp
index 08d57a24..474ed03d 100644
--- a/puppet/modules/site_postfix/manifests/mx.pp
+++ b/puppet/modules/site_postfix/manifests/mx.pp
@@ -31,7 +31,7 @@ class site_postfix::mx {
   }
 
   include site_postfix::mx::smtpd_checks
-  include site_postfix::checks
+  include site_postfix::mx::checks
   include site_postfix::mx::tls
   include site_postfix::mx::reserved_aliases
 
diff --git a/puppet/modules/site_postfix/manifests/mx/checks.pp b/puppet/modules/site_postfix/manifests/mx/checks.pp
new file mode 100644
index 00000000..31399d32
--- /dev/null
+++ b/puppet/modules/site_postfix/manifests/mx/checks.pp
@@ -0,0 +1,41 @@
+class site_postfix::checks {
+
+  file {
+    '/etc/postfix/checks':
+      ensure  => directory,
+      mode    => '0755',
+      owner   => root,
+      group   => postfix,
+      require => Package['postfix'];
+
+    '/etc/postfix/checks/helo_checks':
+      content => template('site_postfix/checks/helo_access.erb'),
+      mode    => '0644',
+      owner   => root,
+      group   => root;
+  }
+
+  exec {
+    '/usr/sbin/postmap /etc/postfix/checks/helo_checks':
+      refreshonly => true,
+      subscribe   => File['/etc/postfix/checks/helo_checks'];
+  }
+
+  # Anonymize the user's home IP from the email headers (Feature #3866)
+  package { 'postfix-pcre': ensure => installed }
+
+  file { '/etc/postfix/checks/received_anon':
+    source  => 'puppet:///modules/site_postfix/checks/received_anon',
+    mode    => '0644',
+    owner   => root,
+    group   => root,
+    notify  => Service['postfix']
+  }
+
+  postfix::config {
+    'header_checks':
+      value   => 'pcre:/etc/postfix/checks/received_anon',
+      require => File['/etc/postfix/checks/received_anon'];
+  }
+
+}
-- 
cgit v1.2.3