X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Fdebian%2Froles%2Fapache%2Ftasks%2Fmain.yml;h=c05eb6f280fe6eb8d4cd2fb017349addea498664;hb=9d43bd9e52701c477ba57d6a0275a6b259a183f8;hp=f0481d91e1c0a80fcef3672125f20fc8d3602edd;hpb=9801f9b6a2732043a4643d02554defdd474ce63e;p=ansible.git

diff --git a/playbooks/debian/roles/apache/tasks/main.yml b/playbooks/debian/roles/apache/tasks/main.yml
index f0481d9..c05eb6f 100644
--- a/playbooks/debian/roles/apache/tasks/main.yml
+++ b/playbooks/debian/roles/apache/tasks/main.yml
@@ -1,47 +1,45 @@
 - name: Check apache
-  command: test -L /etc/apache2/conf-enabled/001-phd.conf
-  failed_when: false
-  register: apache
-  changed_when: apache.rc != 0
+  stat:
+    path: /etc/apache2/conf-enabled/001-phd.conf
+  register: phd_conf
+  changed_when: not phd_conf.stat.exists
 
 - debug:
     msg: "apache has already been configured"
-  when: apache.rc == 0
+  when: phd_conf.stat.exists
 
-- name: Install apache
-  become: true
-  apt:
-    autoclean: yes
-    autoremove: yes
-    install_recommends: no
-    name: apache2
-    purge: yes
-    state: latest
-    update_cache: yes
-  when: apache.rc != 0
+- block:
+    - name: Install apache
+      become: true
+      apt:
+        autoclean: yes
+        autoremove: yes
+        install_recommends: no
+        name: apache2
+        purge: yes
+        state: latest
+        update_cache: yes
 
-- name: Enable SSL module
-  become: true
-  command: a2enmod ssl
-  notify: Reload apache
-  when: apache.rc != 0
+    - name: Enable SSL module
+      become: true
+      command: a2enmod ssl
+      notify: Reload apache
 
-- name: Configure apache
-  become: true
-  template:
-    src: 001-phd.conf
-    dest: /etc/apache2/conf-available
-    owner: root
-    group: root
-    mode: '0640'
-    force: no
-  when: apache.rc != 0
+    - name: Configure apache
+      become: true
+      template:
+        src: 001-phd.conf
+        dest: /etc/apache2/conf-available
+        owner: root
+        group: root
+        mode: '0640'
+        force: no
 
-- name: Enable config
-  become: true
-  command: a2enconf 001-phd
-  notify: Reload apache
-  when: apache.rc != 0
+    - name: Enable config
+      become: true
+      command: a2enconf 001-phd
+      notify: Reload apache
+  when: not phd_conf.stat.exists
 
 - name: Configure logrotate
   become: true