X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Fdebian%2Froles%2Fapache%2Ftasks%2Fmain.yml;h=0d81b0aeed4a9789a1bb47772799a4059a331acf;hb=5066f85b3351fd1cb53e5fe9d484644387fc1ddc;hp=1c6bd2f7848262a3ac5f25e126ad9caa08d39516;hpb=64f279e592bc291ea76ff9e2246f1fc1760c6e83;p=ansible.git

diff --git a/playbooks/debian/roles/apache/tasks/main.yml b/playbooks/debian/roles/apache/tasks/main.yml
index 1c6bd2f..0d81b0a 100644
--- a/playbooks/debian/roles/apache/tasks/main.yml
+++ b/playbooks/debian/roles/apache/tasks/main.yml
@@ -1,44 +1,61 @@
 - 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
+        cache_valid_time: 3600
+        install_recommends: no
+        name: apache2
+        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
+
+    - name: Setup default host
+      become: true
+      copy:
+        src: _default_
+        dest: /usr/local/apache2
+        owner: root
+        group: www-data
+        directory_mode: '0755'
+        mode: '0644'
 
-- name: Configure apache
+    - name: Enable config
+      become: true
+      command: a2enconf 001-phd
+      notify: Reload apache
+  when: not phd_conf.stat.exists
+
+- name: Configure logrotate
   become: true
-  template:
-    src: 001-phd.conf
-    dest: /etc/apache2/conf-available
+  copy:
+    src: apache2
+    dest: /etc/logrotate.d
     owner: root
     group: root
     mode: '0640'
-    force: no
-  when: apache.rc != 0
-
-- name: Enable config
-  become: true
-  command: a2enconf 001-phd
-  notify: Reload apache
-  when: apache.rc != 0