Merge pull request #387 from voxpupuli/fix-386

Author: smortex

manifests/server.pp

@@ -34,13 +34,17 @@
   Optional[Stdlib::Absolutepath] $krb5_keytab_file  = undef,
   Optional[String] $ldap_config_backend             = undef,
   Optional[Boolean] $enable_memory_limit            = undef,
-  Boolean $manage_policy_rc_d                       = true,
+  Optional[Boolean] $manage_policy_rc_d             = undef,
 ) {
   include openldap::server::install
   include openldap::server::config
   include openldap::server::service
   include openldap::server::slapdconf
 
+  unless $manage_policy_rc_d =~ Undef {
+    deprecation('manage_policy_rc_d', 'The manage_policy_rc_d parameter is deprecated and unused. It will be removed in a future version.')
+  }
+
   Class['openldap::server::install']
   -> Class['openldap::server::config']
   ~> Class['openldap::server::service']

manifests/server/install.pp

@@ -5,22 +5,17 @@
   contain openldap::utils
 
   if $facts['os']['family'] == 'Debian' {
-    if $openldap::server::manage_policy_rc_d {
-      $policy_rc_d = @(POLICY)
-        #!/bin/sh
-        if [ "$1" = "slapd" ]; then
-          exit 101
-        fi
-        exit 0
-        | POLICY
-      file { '/usr/sbin/policy-rc.d':
-        ensure  => 'file',
-        mode    => '0755',
-        owner   => 'root',
-        group   => 'root',
-        content => $policy_rc_d,
-        before  => Package[$openldap::server::package],
-      }
+    # When preseeding request to skip the configuration, the service will not
+    # start and the installation will return an error. To avoid this, we mask
+    # the unit. The installer will not attempt to start slapd and the
+    # installation will succed. The module will then be able to tune slapd
+    # accoding to the user needs and finally start (and unmak) the service.
+    exec { 'mask-before-openldap-install':
+      command => "systemctl mask ${openldap::server::service}",
+      unless  => 'test -x /usr/sbin/slapd',
+      creates => "/etc/systemd/system/${openldap::server::service}.service",
+      path    => '/bin:/usr/bin',
+      before  => Package[$openldap::server::package],
     }
     file { '/var/cache/debconf/slapd.preseed':
       ensure  => file,