bump etherpad

[ansible.git] / roles / apache / tasks / main.yml

diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index fe51563466f38562aab6e21a3bc6646ffbc520c5..fee26efff5be7b765f1e34d53fd537d57f45ade8 100644 (file)
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -24,16 +24,17 @@
     dest: /etc/apache2/log-anon
     src: files/log-anon
     mode: +x
     dest: /etc/apache2/log-anon
     src: files/log-anon
     mode: +x

+  notify: apache

 - name: install shared config files
 - name: install shared config files

-  copy:
+  template:

     dest: /etc/apache2/conf-available/{{ item }}
     dest: /etc/apache2/conf-available/{{ item }}

-    src: files/{{ item }}
+    src: templates/{{ item }}

   loop:
   - ssl.conf
   - acme-challenge.conf
   - php5.conf
   - security.conf
   loop:
   - ssl.conf
   - acme-challenge.conf
   - php5.conf
   - security.conf

-  - other-vhosts-access-log.conf
+  - defaults.conf

   notify: apache
 - name: enable config files
   command: a2enconf {{ item }}
   notify: apache
 - name: enable config files
   command: a2enconf {{ item }}


@@ -41,8 +42,39 @@
     creates: /etc/apache2/conf-enabled/{{ item }}.conf
   loop:
   - ssl
     creates: /etc/apache2/conf-enabled/{{ item }}.conf
   loop:
   - ssl

+  - security
+  - defaults
+  notify: apache
+- name: disable config files
+  command: a2disconf {{ item }}
+  args:
+    removes: /etc/apache2/conf-enabled/{{ item }}.conf
+  loop:
+  - other-vhosts-access-log
+  - serve-cgi-bin
+  notify: apache

 - name: install default site
   template:
     dest: /etc/apache2/sites-available/000-default.conf
     src: templates/000-default.conf
   notify: apache
 - name: install default site
   template:
     dest: /etc/apache2/sites-available/000-default.conf
     src: templates/000-default.conf
   notify: apache

+# IPv6 autconf issues: DAD makes addresses appear but unusable, which breaks services startup
+- name: tweak apache systemd unit (create dir)
+  file: path=/etc/systemd/system/apache2.service.d state=directory
+- name: tweak apache systemd unit
+  copy:
+    dest: /etc/systemd/system/apache2.service.d/override.conf
+    content: |
+      [Unit]
+      After=network-online.target
+      Wants=network-online.target
+      [Service]
+      Restart=on-failure
+- name: cleanup old sysconfig
+  file: path=/etc/sysctl.d/50-no-dad.conf state=absent
+- name: sysconfig to fix IPv6 listening
+  copy:
+    dest: /etc/sysctl.d/50-ipv6-listen.conf
+    content: |
+      # Allow binding to IPv6 address before we got that address
+      net.ipv6.ip_nonlocal_bind=1