From fb655ee02895ba2abde01603a22f1c3f7949a7a1 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 1 Sep 2021 17:37:52 +0300 Subject: [PATCH] Updated ansible --- data/ansible/deb_packages/main.yaml | 13 ++++++------- data/ansible/docker/main.yaml | 13 ++++++------- data/ansible/rpm_packages/main.yaml | 13 ++++++------- data/ansible/rpm_packages/nginx.yaml | 5 +++-- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/data/ansible/deb_packages/main.yaml b/data/ansible/deb_packages/main.yaml index f584f3ee8..424b4ff52 100644 --- a/data/ansible/deb_packages/main.yaml +++ b/data/ansible/deb_packages/main.yaml @@ -77,13 +77,12 @@ include: nginx.yaml when: nginxConfig.stdout_lines|length < 1 - - name: Enable nginx - become: true - shell: "systemctl enable nginx" - - - name: Start nginx - become: true - shell: "systemctl start nginx" + - name: Enable and start nginx + systemd: + name: nginx + state: started + masked: no + enabled: yes ########################################################################################################################### ########################################################################################################################### diff --git a/data/ansible/docker/main.yaml b/data/ansible/docker/main.yaml index 53b751c7a..2eb6db283 100644 --- a/data/ansible/docker/main.yaml +++ b/data/ansible/docker/main.yaml @@ -79,13 +79,12 @@ include: nginx.yaml when: nginxConfig.stdout_lines|length < 1 or users_filename|length > 0 - - name: Enable nginx - become: true - shell: "systemctl enable nginx" - - - name: Start nginx - become: true - shell: "systemctl start nginx" + - name: Enable and start nginx + systemd: + name: nginx + state: started + masked: no + enabled: yes - name: Configure docker include: docker.yaml diff --git a/data/ansible/rpm_packages/main.yaml b/data/ansible/rpm_packages/main.yaml index 1cdd71b33..8d367b14b 100644 --- a/data/ansible/rpm_packages/main.yaml +++ b/data/ansible/rpm_packages/main.yaml @@ -108,13 +108,12 @@ include: nginx.yaml when: nginxConfig.stdout_lines|length < 1 - - name: Enable nginx - become: true - shell: "systemctl enable nginx" - - - name: Start nginx - become: true - shell: "systemctl start nginx" + - name: Enable and start nginx + systemd: + name: nginx + state: started + masked: no + enabled: yes - name: Add .rpmmacros in root directory become: true diff --git a/data/ansible/rpm_packages/nginx.yaml b/data/ansible/rpm_packages/nginx.yaml index 90dc90db2..fe9a828bf 100644 --- a/data/ansible/rpm_packages/nginx.yaml +++ b/data/ansible/rpm_packages/nginx.yaml @@ -20,5 +20,6 @@ shell: "sudo firewall-cmd --reload" - name: Restart the nginx so the change take effects - become: true - shell: "sudo systemctl restart nginx" + systemd: + state: restarted + name: nginx