From 8ae9ee203be7b59b108e67e561407a43d5ab6940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 28 Jun 2023 09:56:39 -1000 Subject: [PATCH] Remove deprecated code --- REFERENCE.md | 10 ---------- manifests/server.pp | 8 -------- 2 files changed, 18 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index bc2f3f03..28d2e9d5 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -453,7 +453,6 @@ The following parameters are available in the `openldap::server` class: * [`krb5_keytab_file`](#-openldap--server--krb5_keytab_file) * [`krb5_client_keytab_file`](#-openldap--server--krb5_client_keytab_file) -* [`manage_policy_rc_d`](#-openldap--server--manage_policy_rc_d) * [`package`](#-openldap--server--package) * [`confdir`](#-openldap--server--confdir) * [`conffile`](#-openldap--server--conffile) @@ -503,15 +502,6 @@ configuring sasl with backend GSSAPI Default value: `undef` -##### `manage_policy_rc_d` - -Data type: `Optional[Boolean]` - -If set, manage /usr/sbin/policy-rc.d on Debian based operating systems to not automatically start the LDAP server -when installing slapd. This is required when preseeding the package with the no_configuration flag as we have to. - -Default value: `undef` - ##### `package` Data type: `String[1]` diff --git a/manifests/server.pp b/manifests/server.pp index e449bcbd..23415364 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -5,9 +5,6 @@ # @param krb5_client_keytab_file # if set, manage the env variable KRB5_CLIENT_KTNAME on Debian based operating systems. This is required when # configuring sasl with backend GSSAPI -# @param manage_policy_rc_d -# If set, manage /usr/sbin/policy-rc.d on Debian based operating systems to not automatically start the LDAP server -# when installing slapd. This is required when preseeding the package with the no_configuration flag as we have to. class openldap::server ( String[1] $package, String[1] $confdir, @@ -41,17 +38,12 @@ Optional[Stdlib::Absolutepath] $krb5_client_keytab_file = undef, Optional[String] $ldap_config_backend = undef, Optional[Boolean] $enable_memory_limit = undef, - 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']