diff --git a/roles/ldap_server/files/slapd_logrotate b/roles/ldap_server/files/slapd_logrotate deleted file mode 100644 index 5584beda458f0f2a84b7391454c75e4664744312..0000000000000000000000000000000000000000 --- a/roles/ldap_server/files/slapd_logrotate +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/slapd.log -{ - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - invoke-rc.d rsyslog rotate > /dev/null - endscript -} diff --git a/roles/ldap_server/files/slapd_rsyslog.conf b/roles/ldap_server/files/slapd_rsyslog.conf deleted file mode 100644 index 36000b68a6cab2651dd0b2d42fa2011e7aa8a5a1..0000000000000000000000000000000000000000 --- a/roles/ldap_server/files/slapd_rsyslog.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Log slapd messages into separate log file. -local4.* /var/log/slapd.log diff --git a/roles/ldap_server/handlers/main.yml b/roles/ldap_server/handlers/main.yml index 4968d3587ba97f8f3d69b8b59b2dbc45d9c33954..b7ad66e94652650fec8be772b56b40d1527dd357 100644 --- a/roles/ldap_server/handlers/main.yml +++ b/roles/ldap_server/handlers/main.yml @@ -1,11 +1,5 @@ --- -- name: Restart rsyslog - service: - name: rsyslog - state: restarted - when: "ansible_distribution_release == 'bullseye'" - - name: Restart slapd service: name: slapd diff --git a/roles/ldap_server/molecule/default/molecule.yml b/roles/ldap_server/molecule/default/molecule.yml index ff0992ef99332359bb2ff8bdd514000908120e3e..a281b543c2ba0548583f8dbdb7c86723c63cdc4d 100644 --- a/roles/ldap_server/molecule/default/molecule.yml +++ b/roles/ldap_server/molecule/default/molecule.yml @@ -26,35 +26,6 @@ platforms: network_name: private_network type: static - - name: parameters-mandatory-bullseye - groups: - - parameters-mandatory - box: debian/bullseye64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.31 - network_name: private_network - type: static - - - name: parameters-optional-bullseye - groups: - - parameters-optional - - backup-server - box: debian/bullseye64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.32 - network_name: private_network - type: static - - name: parameters-mandatory-bookworm groups: - parameters-mandatory diff --git a/roles/ldap_server/molecule/default/prepare.yml b/roles/ldap_server/molecule/default/prepare.yml index a66e42fb935227121e540070fce93b2cdffd0b6d..b8fe70ad6d3b51be79b68e000cec88983b673e5b 100644 --- a/roles/ldap_server/molecule/default/prepare.yml +++ b/roles/ldap_server/molecule/default/prepare.yml @@ -23,10 +23,6 @@ - "{{ item.name }}" - "{{ item.fqdn }}" with_items: - - name: parameters-mandatory-bullseye_ldap - fqdn: parameters-mandatory - - name: parameters-optional-bullseye_ldap - fqdn: parameters-optional - name: parameters-mandatory-bookworm_ldap fqdn: parameters-mandatory - name: parameters-optional-bookworm_ldap @@ -83,8 +79,6 @@ mode: 0644 state: present 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 diff --git a/roles/ldap_server/molecule/default/tests/test_default_bookworm.py b/roles/ldap_server/molecule/default/tests/test_default_bookworm.py deleted file mode 100644 index 3348949aa120cecadbeec4cc9da2604e86f794ac..0000000000000000000000000000000000000000 --- a/roles/ldap_server/molecule/default/tests/test_default_bookworm.py +++ /dev/null @@ -1,25 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('parameters-*-bookworm') - - -def test_log_rotation_configuration(host): - """ - Tests if log rotation configuration file is absent. - """ - - config = host.file('/etc/logrotate.d/slapd') - assert not config.exists - - -def test_syslog_configuration(host): - """ - Tests if syslog configuration file is absent. - """ - - config = host.file('/etc/rsyslog.d/slapd.conf') - assert not config.exists diff --git a/roles/ldap_server/molecule/default/tests/test_default_bullseye.py b/roles/ldap_server/molecule/default/tests/test_default_bullseye.py deleted file mode 100644 index 474a17a83b95ba8a8019801853c382fd6d34af7f..0000000000000000000000000000000000000000 --- a/roles/ldap_server/molecule/default/tests/test_default_bullseye.py +++ /dev/null @@ -1,43 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('parameters-*-bullseye') - - -def test_log_rotation_configuration(host): - """ - Tests if log rotation configuration file has been deployed correctly and has - valid syntax. - """ - - config = host.file('/etc/logrotate.d/slapd') - - assert config.is_file - assert config.user == 'root' - assert config.group == 'root' - assert config.mode == 0o644 - - with host.sudo(): - - assert host.run('logrotate /etc/logrotate.d/slapd').rc == 0 - - -def test_syslog_configuration(host): - """ - Tests if syslog configuration file has been deployed, and log file was - created correctly (and is being logged to). - """ - - config = host.file('/etc/rsyslog.d/slapd.conf') - assert config.is_file - assert config.user == 'root' - assert config.group == 'root' - assert config.mode == 0o644 - - with host.sudo(): - log = host.file('/var/log/slapd.log') - assert log.is_file - assert 'slapd' in log.content_string diff --git a/roles/ldap_server/tasks/main.yml b/roles/ldap_server/tasks/main.yml index efa0ce21e1bb0c3e1619351923541e4d3e6c8a60..6624df60f1614700f7d6bc429b5ca37844faf6c5 100644 --- a/roles/ldap_server/tasks/main.yml +++ b/roles/ldap_server/tasks/main.yml @@ -57,26 +57,6 @@ state: started enabled: true -- name: Deploy system logger configuration file for slapd - copy: - src: slapd_rsyslog.conf - dest: /etc/rsyslog.d/slapd.conf - owner: root - group: root - mode: 0644 - when: "ansible_distribution_release == 'bullseye'" - notify: - - Restart rsyslog - -- name: Deploy configuration file for log rotation of slapd logs - copy: - src: slapd_logrotate - dest: /etc/logrotate.d/slapd - owner: root - group: root - mode: 0644 - when: "ansible_distribution_release == 'bullseye'" - - name: Change log level for slapd ldap_attr: dn: cn=config