From e0df3d6f77695792816453a930cfa7eff4d94bfd Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 6 Apr 2016 21:17:24 -0300
Subject: Take advantage of autoloading

---
 manifests/disabled.pp |  5 +++++
 manifests/init.pp     | 41 -----------------------------------------
 manifests/tls.pp      | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 41 deletions(-)
 create mode 100644 manifests/disabled.pp
 create mode 100644 manifests/tls.pp

(limited to 'manifests')

diff --git a/manifests/disabled.pp b/manifests/disabled.pp
new file mode 100644
index 0000000..8c82b6b
--- /dev/null
+++ b/manifests/disabled.pp
@@ -0,0 +1,5 @@
+class exim::disabled inherits exim {
+  Service['exim4'] { 
+    ensure  => stopped,
+  }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 1450e1f..087d586 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -70,44 +70,3 @@ class exim {
   }
 
 }
-
-class exim::disabled inherits exim {
-  Service['exim4'] { 
-    ensure  => stopped,
-  }
-}
-
-# See http://www.exim.org/exim-html-current/doc/html/spec_html/ch39.html
-class exim::tls inherits exim {
-  file { "/etc/exim4/conf.d/router/195_exim4_config_tls_verify":
-    ensure => present,
-    owner  => root,
-    group  => root,
-    mode   => 0644,
-    source => "puppet:///modules/exim/195_exim4_config_tls_verify",
-    notify => Service["exim4"],
-  }
-
-  file { "/etc/exim4/conf.d/transport/30_exim4-config_remote_smtp_tls_verify":
-    ensure => present,
-    owner  => root,
-    group  => root,
-    mode   => 0644,
-    source => "puppet:///modules/exim/30_exim4-config_remote_smtp_tls_verify",
-    notify => Service["exim4"],
-  }
-
-  $exim_tls_verify_relay_to_domains = hiera('exim::tls_verify_relay_to_domains', '')
-
-  file { '/etc/exim4/conf.d/main/00_local_settings':
-    ensure  => $exim_tls_verify_relay_to_domains ? {
-      ''      => absent,
-      default => present,
-    },
-    owner   => root,
-    group   => root,
-    mode    => 0644,
-    content => "domainlist tls_verify_relay_to_domains = $exim_tls_verify_relay_to_domains\n",
-    notify  => Service["exim4"],
-  }
-}
diff --git a/manifests/tls.pp b/manifests/tls.pp
new file mode 100644
index 0000000..79147dd
--- /dev/null
+++ b/manifests/tls.pp
@@ -0,0 +1,34 @@
+# See http://www.exim.org/exim-html-current/doc/html/spec_html/ch39.html
+class exim::tls inherits exim {
+  file { "/etc/exim4/conf.d/router/195_exim4_config_tls_verify":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    source => "puppet:///modules/exim/195_exim4_config_tls_verify",
+    notify => Service["exim4"],
+  }
+
+  file { "/etc/exim4/conf.d/transport/30_exim4-config_remote_smtp_tls_verify":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    source => "puppet:///modules/exim/30_exim4-config_remote_smtp_tls_verify",
+    notify => Service["exim4"],
+  }
+
+  $exim_tls_verify_relay_to_domains = hiera('exim::tls_verify_relay_to_domains', '')
+
+  file { '/etc/exim4/conf.d/main/00_local_settings':
+    ensure  => $exim_tls_verify_relay_to_domains ? {
+      ''      => absent,
+      default => present,
+    },
+    owner   => root,
+    group   => root,
+    mode    => 0644,
+    content => "domainlist tls_verify_relay_to_domains = $exim_tls_verify_relay_to_domains\n",
+    notify  => Service["exim4"],
+  }
+}
-- 
cgit v1.2.3