majic-ansible-roles Changeset

Changeset - aa7b596ef595

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Branko Majic (branko) - 3 years ago 2021-01-18 22:52:14
branko@majic.rs

MAR-151: Drop rcconf workaround:

- The workaround was needed on Debian Jessie because the systemctl
is-enabled command did not behave correctly for SysV init scripts.
- Drop the installation of the rcconf package.
- Use the "enabled" parameter in service module instead.

6 files changed with 15 insertions and 44 deletions:

roles/common/molecule/default/tests/test_default.py

roles/common/tasks/main.yml

roles/ldap_server/tasks/main.yml

roles/mail_forwarder/tasks/main.yml

roles/mail_server/tasks/main.yml

roles/xmpp_server/tasks/main.yml

0 comments (0 inline, 0 general)

roles/common/molecule/default/tests/test_default.py

➞

Show inline comments

@@ @@ -117,7 +117,6 @@ def test_installed_packages(host): @@
     assert host.package('sudo').is_installed
     assert host.package('ssl-cert').is_installed
     assert host.package('rcconf').is_installed
     assert host.package('ferm').is_installed
     assert host.package('apticron').is_installed
     assert host.package('python-setuptools').is_installed

roles/common/tasks/main.yml

➞

Show inline comments

@@ @@ -92,11 +92,6 @@ @@
     name: ssl-cert
     state: present
 - name: Install rcconf (workaround for systemctl broken handling of SysV)
   apt:
     name: rcconf
     state: present
 - name: Install common packages
   apt:
     name: "{{ common_packages }}"
@@ @@ -226,15 +221,11 @@ @@
   notify:
     - Restart ferm
 - name: Enable ferm service on boot (workaround for systemctl broken handling of SysV)
   command: "rcconf -on ferm"
   register: result
   changed_when: not result.stderr
 - name: Enable ferm service
 - name: Enable and start ferm
   service:
     name: ferm
     state: started
     enabled: true
 - name: Deploy script for validating server certificates
   copy:

roles/ldap_server/tasks/main.yml

➞

Show inline comments

@@ @@ -51,15 +51,11 @@ @@
   notify:
     - Restart slapd
 - name: Enable slapd service on boot (workaround for systemctl broken handling of SysV)
   command: "rcconf -on slapd"
   register: result
   changed_when: not result.stderr
 - name: Enable slapd service
 - name: Enable and start slapd service
   service:
     name: slapd
     state: started
     enabled: true
 - name: Deploy system logger configuration file for slapd
   copy:

roles/mail_forwarder/tasks/main.yml

➞

Show inline comments

@@ @@ -64,15 +64,11 @@ @@
   notify:
     - Rebuild mail aliases
 - name: Enable Postfix service on boot (workaround for systemctl broken handling of SysV)
   command: "rcconf -on postfix"
   register: result
   changed_when: not result.stderr
 - name: Enable postfix service
 - name: Enable and start postfix service
   service:
     name: postfix
     state: started
     enabled: true
 - name: Deploy firewall configuration for mail forwader
   template:

roles/mail_server/tasks/main.yml

➞

Show inline comments

@@ @@ -265,21 +265,11 @@ @@
   notify:
     - Restart Postfix
 - name: Enable services on boot (workaround for systemctl broken handling of SysV)
   command: "rcconf -on {{ item }}"
   with_items:
     - clamav-daemon
     - clamav-freshclam
     - clamav-milter
     - postfix
     - dovecot
   register: result
   changed_when: not result.stderr
 - name: Enable ClamAV database update service (freshclam)
 - name: Enable and start ClamAV database update service (freshclam)
   service:
     name: clamav-freshclam
     state: started
     enabled: true
 - name: Check availability of ClamAV database files
   stat:
@@ @@ -297,10 +287,11 @@ @@
     path: "{{ item.item | replace('.cld', '.cvd') }}"
     timeout: 600
 - name: Enable ClamAV daemon and milter services
+- name: Enable and start ClamAV daemon and milter services
   service:
     name: "{{ item }}"
     state: started
     enabled: true
   with_items:
     - clamav-daemon
     - clamav-milter
@@ @@ -311,15 +302,17 @@ @@
     path: "/var/run/clamav/clamd.ctl"
     timeout: 300
 - name: Enable Postfix service
+- name: Enable and start Postfix service
   service:
     name: postfix
     state: started
     enabled: true
 - name: Enable Dovecot service
+- name: Enable and start Dovecot service
   service:
     name: dovecot
     state: started
     enabled: true
 - name: Deploy firewall configuration for mail server
   copy:

roles/xmpp_server/tasks/main.yml

➞

Show inline comments

@@ @@ -147,15 +147,11 @@ @@
   notify:
     - Restart Prosody
 - name: Enable Prosody service on boot (workaround for systemctl broken handling of SysV)
   command: "rcconf -on prosody"
   register: result
   changed_when: not result.stderr
 - name: Enable and start Prosody service
   service:
     name: prosody
     state: started
     enabled: true
 - name: Deploy firewall configuration for XMPP server
   copy:

0 comments (0 inline, 0 general)