From f0aec76e5082ae38012fe1d1ec7a1ba99962559a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Wed, 20 Jun 2012 09:54:10 +0300
Subject: [PATCH] Moved saslauthd module contents to sasl module and added
 deprecation warning to saslauthd module.

---
 {saslauthd => sasl}/files/service.conf |  0
 sasl/manifests/init.pp                 | 97 ++++++++++++++++++++++++++
 saslauthd/manifests/init.pp            | 63 ++---------------
 3 files changed, 101 insertions(+), 59 deletions(-)
 rename {saslauthd => sasl}/files/service.conf (100%)
 create mode 100644 sasl/manifests/init.pp

diff --git a/saslauthd/files/service.conf b/sasl/files/service.conf
similarity index 100%
rename from saslauthd/files/service.conf
rename to sasl/files/service.conf
diff --git a/sasl/manifests/init.pp b/sasl/manifests/init.pp
new file mode 100644
index 0000000..b8d60b6
--- /dev/null
+++ b/sasl/manifests/init.pp
@@ -0,0 +1,97 @@
+
+# Install sasl client
+#
+class sasl::client {
+
+    package { "cyrus-sasl":
+        ensure => installed,
+    }
+
+    if $kerberos_realm {
+        package { "cyrus-sasl-gssapi":
+            ensure => installed,
+        }
+    }
+
+}
+
+# Install saslauthd daemon.
+#
+# === Global variables
+#
+#   $saslauthd_mech:
+#       Authentication mechanism to use. Defaults to system default.
+#
+class sasl::saslauthd {
+
+    require sasl::client
+
+    case $saslauthd_mech {
+        "","pam": { }
+        "kerberos5": {
+            augeas { "set-saslauthd-mech":
+                context => "/files/etc/sysconfig/saslauthd",
+                changes => "set MECH kerberos5",
+                notify  => Service["saslauthd"],
+            }
+        }
+        default: {
+            fail("Unknown mechanism ${saslauthd_mech} for sasl::saslauthd")
+        }
+    }
+
+    service { "saslauthd":
+        ensure  => running,
+        enable  => true,
+    }
+
+    file { "/etc/sasldb2":
+        ensure  => present,
+        mode    => "0644",
+        owner   => "root",
+        group   => "root",
+        require => Exec["generate-sasldb2"],
+        before  => Service["saslauthd"],
+    }
+    exec { "generate-sasldb2":
+        command => "saslpasswd2 -d foobar ; true",
+        path    => "/bin:/usr/bin:/sbin:/usr/sbin",
+        creates => "/etc/sasldb2",
+    }
+
+}
+
+
+# Install saslauthd service config
+#
+# === Parameters
+#
+#   $name:
+#       Service name.
+#
+# === Sample usage
+#
+# sasl::saslauthd::service { "Sendmail": }
+#
+define sasl::saslauthd::service() {
+
+    case $architecture {
+        "i386":   { $libdir = "/usr/lib/sasl2" }
+        "x86_64": { $libdir = "/usr/lib64/sasl2" }
+        default:  { fail("Unknown architecture ${architecture}") }
+    }
+
+    file { "${libdir}/${name}.conf":
+        ensure  => present,
+        source  => [ "puppet:///files/sasl/${name}.${fqdn}.conf",
+                     "puppet:///files/sasl/${name}.conf",
+                     "puppet:///files/sasl/service.conf",
+                     "puppet:///modules/sasl/service.conf", ],
+        mode    => "0644",
+        owner   => "root",
+        group   => "root",
+        require => Service["saslauthd"],
+    }
+
+}
+
diff --git a/saslauthd/manifests/init.pp b/saslauthd/manifests/init.pp
index 9ebb5af..e4d1464 100644
--- a/saslauthd/manifests/init.pp
+++ b/saslauthd/manifests/init.pp
@@ -7,48 +7,8 @@
 #
 class saslauthd::server {
 
-    package { "cyrus-sasl":
-        ensure => installed,
-    }
-
-    case $saslauthd_mech {
-        "","pam": { }
-        "kerberos5": {
-            package { "cyrus-sasl-gssapi":
-                ensure => installed,
-                before => Service["saslauthd"],
-            }
-            augeas { "set-saslauthd-mech":
-                context => "/files/etc/sysconfig/saslauthd",
-                changes => "set MECH kerberos5",
-                require => Package["cyrus-sasl"],
-                notify  => Service["saslauthd"],
-            }
-        }
-        default: {
-            fail("Unknown mechanism ${saslauthd_mech} for saslauthd::server")
-        }
-    }
-
-    service { "saslauthd":
-        ensure  => running,
-        enable  => true,
-        require => Package["cyrus-sasl"],
-    }
-
-    file { "/etc/sasldb2":
-        ensure  => present,
-        mode    => "0644",
-        owner   => "root",
-        group   => "root",
-        require => Exec["generate-sasldb2"],
-    }
-    exec { "generate-sasldb2":
-        command => "saslpasswd2 -d foobar ; true",
-        path    => "/bin:/usr/bin:/sbin:/usr/sbin",
-        creates => "/etc/sasldb2",
-        require => Package["cyrus-sasl"],
-    }
+    require sasl::saslauthd
+    notice("Deprecation notice: saslauthd::server is deprecated, use sasl::saslauthd instead")
 
 }
 
@@ -66,22 +26,7 @@ class saslauthd::server {
 #
 define saslauthd::service() {
 
-    case $architecture {
-        "i386":   { $libdir = "/usr/lib/sasl2" }
-        "x86_64": { $libdir = "/usr/lib64/sasl2" }
-        default:  { fail("Unknown architecture ${architecture}") }
-    }
-
-    file { "${libdir}/${name}.conf":
-        ensure  => present,
-        source  => [ "puppet:///files/saslauthd/${name}.${fqdn}.conf",
-                     "puppet:///files/saslauthd/${name}.conf",
-                     "puppet:///files/saslauthd/service.conf",
-                     "puppet:///modules/saslauthd/service.conf", ],
-        mode    => "0644",
-        owner   => "root",
-        group   => "root",
-        require => Service["saslauthd"],
-    }
+    sasl::saslauthd::service { $name: }
+    notice("Deprecation notice: saslauthd::service is deprecated, use sasl::saslauthd::service instead")
 
 }