From 69d4c817537c68e5132434de8ea63b0afdd4fc6b Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Fri, 18 Dec 2015 15:38:47 +0200
Subject: [PATCH] sasl: Don't create /var/run/saslauthd manually and fix
 depency error from saslauthd tmpfiles config on CentOS 7.

---
 sasl/manifests/init.pp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/sasl/manifests/init.pp b/sasl/manifests/init.pp
index 99fa85e..3887f35 100644
--- a/sasl/manifests/init.pp
+++ b/sasl/manifests/init.pp
@@ -137,14 +137,14 @@ class sasl::saslauthd {
     if $user {
         case $::operatingsystem {
             "centos","fedora","redhat": {
-                file { "/var/run/saslauthd":
-                    ensure => directory,
-                    mode   => "0775",
-                    owner  => "root",
-                    group  => $user,
-                    before => Service["saslauthd"],
-                }
                 if versioncmp($::operatingsystemrelease, "7") < 0 {
+                    file { "/var/run/saslauthd":
+                        ensure => directory,
+                        mode   => "0775",
+                        owner  => "root",
+                        group  => $user,
+                        before => Service["saslauthd"],
+                    }
                     augeas { "set-saslauthd-user":
                         context => "/files/etc/sysconfig/saslauthd",
                         changes => "set DAEMONOPTS '\"--user ${user}\"'",
@@ -174,6 +174,7 @@ class sasl::saslauthd {
                         owner   => "root",
                         group   => "root",
                         require => Class["sasl::client"],
+                        before  => Service["saslauthd"],
                     }
                 }
             }