library/roles/apache: Fix the configuration for Ubuntu > 14.04. Remove support for Ubuntu Precise.

This commit is contained in:
Andrea Dell'Amico 2018-10-22 16:14:52 +02:00
parent 286d11e2ed
commit aa7b8ac9f2
2 changed files with 1 additions and 10 deletions

View File

@ -14,13 +14,6 @@
- name: Enable the apache letsencrypt directives on trusty - name: Enable the apache letsencrypt directives on trusty
file: src=/etc/apache2/conf-available/{{ item }} dest=/etc/apache2/conf-enabled/{{ item }} state=link file: src=/etc/apache2/conf-available/{{ item }} dest=/etc/apache2/conf-enabled/{{ item }} state=link
with_items: '{{ apache_letsencrypt_proxy_conf }}' with_items: '{{ apache_letsencrypt_proxy_conf }}'
when: is_trusty
notify: apache2 reload
- name: Install the apache letsencrypt directives on precise
template: src={{ item }}.j2 dest=/etc/apache2/conf.d/{{ item }} owner=root group=root mode=0644
with_items: '{{ apache_letsencrypt_proxy_conf }}'
when: is_precise
notify: apache2 reload notify: apache2 reload
- name: Create the acme hooks directory if it does not yet exist - name: Create the acme hooks directory if it does not yet exist

View File

@ -20,9 +20,7 @@
- name: Load the apache ssl modules - name: Load the apache ssl modules
apache2_module: name={{ item }} state=present apache2_module: name={{ item }} state=present
with_items: '{{ apache_ssl_modules }}' with_items: '{{ apache_ssl_modules }}'
when: when: apache_ssl_modules_enabled
- apache_ssl_modules_enabled
- is_trusty
notify: apache2 reload notify: apache2 reload
tags: [ 'apache', 'apache_mods' ] tags: [ 'apache', 'apache_mods' ]