diff --git a/docs/rolereference.rst b/docs/rolereference.rst index c2013506581cfe8b872a3cfdc12fe3f8c64ed946..76c5943065288083947d16c0a7dcb40c3388ec97 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -793,6 +793,7 @@ Distribution compatibility Role is compatible with the following distributions: - Debian 11 (Bullseye) +- Debian 12 (Bookworm) Examples diff --git a/roles/ldap_server/meta/main.yml b/roles/ldap_server/meta/main.yml index 10b06c7febd7349769415de57dd1993f96502af0..e8565d03a6fa2294a4363d18c50b8a2dd765617a 100644 --- a/roles/ldap_server/meta/main.yml +++ b/roles/ldap_server/meta/main.yml @@ -18,3 +18,4 @@ galaxy_info: - name: Debian versions: - 11 + - 12 diff --git a/roles/ldap_server/molecule/default/molecule.yml b/roles/ldap_server/molecule/default/molecule.yml index de7d3b20135445222bf1866f2e93c6cfd254f722..ff0992ef99332359bb2ff8bdd514000908120e3e 100644 --- a/roles/ldap_server/molecule/default/molecule.yml +++ b/roles/ldap_server/molecule/default/molecule.yml @@ -15,7 +15,7 @@ lint: platforms: - name: client - box: debian/bullseye64 + box: debian/bookworm64 memory: 512 cpus: 1 provider_raw_config_args: @@ -55,6 +55,35 @@ platforms: network_name: private_network type: static + - name: parameters-mandatory-bookworm + groups: + - parameters-mandatory + box: debian/bookworm64 + memory: 384 + cpus: 1 + provider_raw_config_args: + - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" + interfaces: + - auto_config: true + ip: 192.168.56.21 + network_name: private_network + type: static + + - name: parameters-optional-bookworm + groups: + - parameters-optional + - backup-server + box: debian/bookworm64 + memory: 384 + cpus: 1 + provider_raw_config_args: + - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" + interfaces: + - auto_config: true + ip: 192.168.56.22 + network_name: private_network + type: static + provisioner: name: ansible playbooks: diff --git a/roles/ldap_server/molecule/default/prepare.yml b/roles/ldap_server/molecule/default/prepare.yml index f35ecc136cf3eb447ccd508a7a240f90c15eb3a5..a66e42fb935227121e540070fce93b2cdffd0b6d 100644 --- a/roles/ldap_server/molecule/default/prepare.yml +++ b/roles/ldap_server/molecule/default/prepare.yml @@ -27,6 +27,10 @@ fqdn: parameters-mandatory - name: parameters-optional-bullseye_ldap fqdn: parameters-optional + - name: parameters-mandatory-bookworm_ldap + fqdn: parameters-mandatory + - name: parameters-optional-bookworm_ldap + fqdn: parameters-optional - name: Set-up link to generated X.509 material file: @@ -81,6 +85,8 @@ with_dict: 192.168.56.31: parameters-mandatory-bullseye 192.168.56.32: parameters-optional-bullseye + 192.168.56.21: parameters-mandatory-bookworm + 192.168.56.22: parameters-optional-bookworm - hosts: parameters-optional become: true diff --git a/roles/ldap_server/molecule/default/tests/test_mandatory.py b/roles/ldap_server/molecule/default/tests/test_mandatory.py index 251893e7c7783493c8cb54fa5563a3e63831627c..ad9eea7926a6fa34c6935dab17e845e0790c6e0b 100644 --- a/roles/ldap_server/molecule/default/tests/test_mandatory.py +++ b/roles/ldap_server/molecule/default/tests/test_mandatory.py @@ -128,7 +128,8 @@ def test_permissions(host): with host.sudo(): permissions = host.run("ldapsearch -o ldif-wrap=no -H ldapi:/// -Q -LLL -Y EXTERNAL -b 'olcDatabase={1}mdb,cn=config' -s base olcAccess olcAccess") - expected_permissions = """olcAccess: {0}to * by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth manage by dn="cn=admin,dc=local" manage by * break + expected_permissions = \ + """olcAccess: {0}to * by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth manage by dn="cn=admin,dc=local" manage by * break olcAccess: {1}to attrs=userPassword,shadowLastChange by self write by anonymous auth by * none olcAccess: {2}to dn.base="" by * read olcAccess: {3}to * by self write by dn="cn=admin,dc=local" write by users read by * none"""