From f120b59d3d1ef7cd370f20e5c7ff2da63c07fea8 Mon Sep 17 00:00:00 2001
From: Michelle <michelle.quintero@camilion.eu>
Date: Thu, 2 Feb 2023 18:49:05 -0500
Subject: [PATCH 1/3] Package updated freebsd, shellcheck SC2086 fixed

Updated the  reference to the opeldap package for the FreeBSD platform
to the latest.

Corrected some misuse of quotation marks for calling a variable after
disabling shellcheck SC2086.
---
 cdist/conf/type/__openldap_server/manifest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cdist/conf/type/__openldap_server/manifest b/cdist/conf/type/__openldap_server/manifest
index 2aeece26..1009f7e6 100644
--- a/cdist/conf/type/__openldap_server/manifest
+++ b/cdist/conf/type/__openldap_server/manifest
@@ -19,7 +19,7 @@ CONF_OWNER="root"
 CONF_GROUP="root"
 case "${os}" in
     freebsd)
-        PKGS="openldap-server"
+        PKGS="openldap26-server"
         ETC="/usr/local/etc"
         SLAPD_DIR="/usr/local/etc/openldap"
         SLAPD_DATA_DIR="/var/db/openldap-data"
@@ -197,12 +197,12 @@ if [ -z "${_skip_letsencrypt_cert}" ]; then
         staging=""
     fi
 
+    __directory "${SLAPD_DIR}/sasl2"
     # shellcheck disable=SC2086
-    __directory ${SLAPD_DIR}/sasl2
     require="__directory/${SLAPD_DIR}/sasl2" __letsencrypt_cert "${name}" \
         --admin-email "${admin_email}" \
         --renew-hook "cp ${ETC}/letsencrypt/live/${name}/*.pem ${SLAPD_DIR}/sasl2 && chown -R ${CONF_OWNER}:${CONF_GROUP} ${SLAPD_DIR}/sasl2 && service slapd restart" \
-        --automatic-renewal "${staging}"
+        --automatic-renewal ${staging}
 fi
 
 require="__package/${PKG_MAIN}" __directory ${SLAPD_DIR}/slapd.d --state absent
-- 
2.49.1


From 0d14070f4e9dcccc95313c6c159c6bcb637ccaae Mon Sep 17 00:00:00 2001
From: Michelle <michelle.quintero@camilion.eu>
Date: Thu, 2 Feb 2023 19:49:18 -0500
Subject: [PATCH 2/3] Removed ppolicy from default schema in openldap

The ppolicy was causing problems at executing the tipe openldap and
wasn't no longer necessary.
---
 cdist/conf/type/__openldap_server/parameter/default/schema | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cdist/conf/type/__openldap_server/parameter/default/schema b/cdist/conf/type/__openldap_server/parameter/default/schema
index 825bdb15..764d67e6 100644
--- a/cdist/conf/type/__openldap_server/parameter/default/schema
+++ b/cdist/conf/type/__openldap_server/parameter/default/schema
@@ -8,5 +8,4 @@ java
 misc
 nis
 openldap
-ppolicy
 collective
-- 
2.49.1


From 462fbb1167a636973d45a39890959c0b71648b7a Mon Sep 17 00:00:00 2001
From: Michelle <michelle.quintero@camilion.eu>
Date: Thu, 2 Feb 2023 20:12:11 -0500
Subject: [PATCH 3/3] Added descriptions and example to postgresql type

Added some description that where lacking for some parameters.

An example detailing the use of --login parameter was added to avoid
confusion.
---
 cdist/conf/type/__postgres_role/man.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cdist/conf/type/__postgres_role/man.rst b/cdist/conf/type/__postgres_role/man.rst
index 11fd73d5..29927e77 100644
--- a/cdist/conf/type/__postgres_role/man.rst
+++ b/cdist/conf/type/__postgres_role/man.rst
@@ -27,10 +27,19 @@ All parameter map directly to the corresponding postgres createrole
 parameters.
 
 login
+    Allow the created user to log into the database.
+
 createdb
+    Automatically creates a database for the role just created.
+
 createrole
+    Allows the new role to create new roles.
+
 superuser
+    The new role has superuser privileges.
+
 inherit
+    Allows the new role to inherit privileges from another user.
 
 EXAMPLES
 --------
@@ -41,6 +50,9 @@ EXAMPLES
 
     __postgres_role myrole --password 'secret'
 
+    # Without the parameter `--login` the role won't have login privileges
+    __postgres_role myrole --password 'secret' --login
+
     __postgres_role admin --password 'very-secret' --superuser
 
     __postgres_role dbcustomer --password 'bla' --createdb
-- 
2.49.1