remove duplicate resource

manifests/authentication.pp

@@ -15,22 +15,17 @@ class su_ldap::authentication (
     crit("at least one of auth_gssapi and/or auth_simple must be enabled")
   }
 
+  # Configure SASL for slapd.
+  file { '/etc/ldap/sasl2/slapd.conf':
+    content => template('su_ldap/etc/ldap/sasl2/slapd.conf.erb'),
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+  }
+
   # saslauthd package
   package { 'sasl2-bin': ensure => installed }
 
-  # TODO: commit files and fix path names
-  # note: the file slapd.conf-saslauthd permits both sasl and gssapi auth
-  file {
-    '/etc/default/saslauthd':
-      ensure  => present,
-      source  => 'puppet:///modules/s_ldap/etc/default/saslauthd',
-      require => Package['sasl2-bin'];
-    '/etc/ldap/sasl2/slapd.conf':
-      ensure  => present,
-      source  => 'puppet:///modules/s_ldap/etc/ldap/sasl2/slapd.conf-saslauthd',
-      require => Package['slapd'];
-  }
-
   # Make sure the saslauthd service, the service that allows "simple"
   # binds to work, is running.
   # TODO: see if we can specify this at run time, especially for containers
@@ -41,16 +36,15 @@ class su_ldap::authentication (
       hasstatus => false,
       status    => 'test -f /etc/nosaslauthd || pidof saslauthd',
     }
-  }
 
-  # Configure SASL for slapd.
-  file { '/etc/ldap/sasl2/slapd.conf':
-    content => template('su_ldap/etc/ldap/sasl2/slapd.conf.erb'),
-    owner   => root,
-    group   => root,
-    mode    => '0644',
+    file { '/etc/default/saslauthd':
+      ensure  => present,
+      source  => 'puppet:///modules/s_ldap/etc/default/saslauthd',
+      require => Package['sasl2-bin'];
+    }
   }
 
+
   ## Do the iptables dance elsewhere, because it's different depending on what
   ## type of server or location is used, and this module is generic for building
   ## the auth part