From 23b3afacc9af6b43bf9cb114f4dda89456d9d120 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Mon, 10 Aug 2015 15:39:56 +0300
Subject: [PATCH] sasl: Fix running saslauthd as non root on CentOS 7.

---
 sasl/manifests/init.pp | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/sasl/manifests/init.pp b/sasl/manifests/init.pp
index 0d9dc17..36cf674 100644
--- a/sasl/manifests/init.pp
+++ b/sasl/manifests/init.pp
@@ -138,10 +138,37 @@ class sasl::saslauthd {
                     group  => $user,
                     before => Service["saslauthd"],
                 }
-                augeas { "set-saslauthd-user":
-                    context => "/files/etc/sysconfig/saslauthd",
-                    changes => "set DAEMONOPTS '\"--user ${user}\"'",
-                    notify  => Service["saslauthd"],
+                if versioncmp($::operatingsystemrelease, "7") < 0 {
+                    augeas { "set-saslauthd-user":
+                        context => "/files/etc/sysconfig/saslauthd",
+                        changes => "set DAEMONOPTS '\"--user ${user}\"'",
+                        notify  => Service["saslauthd"],
+                    }
+                } else {
+                    file { "/etc/systemd/system/saslauthd.service.d":
+                        ensure  => directory,
+                        mode    => "0644",
+                        owner   => "root",
+                        group   => "root",
+                        require => Class["sasl::client"],
+                    }
+                    file { "/etc/systemd/system/saslauthd.service.d/user.conf":
+                        ensure  => present,
+                        content => "[Service]\nUser=${user}\n",
+                        mode    => "0644",
+                        owner   => "root",
+                        group   => "root",
+                        require => File["/etc/systemd/system/saslauthd.service.d"],
+                        notify  => Service["saslauthd"],
+                    }
+                    file { "/usr/lib/tmpfiles.d/saslauthd.conf":
+                        ensure  => present,
+                        content => "d /run/saslauthd 0775 root ${user} -\n",
+                        mode    => "0644",
+                        owner   => "root",
+                        group   => "root",
+                        require => Class["sasl::client"],
+                    }
                 }
             }
             default: {