From aa7b8ac9f21fd842015008527690fb311d151216 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 22 Oct 2018 16:14:52 +0200 Subject: [PATCH] library/roles/apache: Fix the configuration for Ubuntu > 14.04. Remove support for Ubuntu Precise. --- apache/tasks/apache-letsencrypt.yml | 7 ------- apache/tasks/apache-modules.yml | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/apache/tasks/apache-letsencrypt.yml b/apache/tasks/apache-letsencrypt.yml index f9a2faf..c15a9de 100644 --- a/apache/tasks/apache-letsencrypt.yml +++ b/apache/tasks/apache-letsencrypt.yml @@ -14,13 +14,6 @@ - name: Enable the apache letsencrypt directives on trusty file: src=/etc/apache2/conf-available/{{ item }} dest=/etc/apache2/conf-enabled/{{ item }} state=link 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 - name: Create the acme hooks directory if it does not yet exist diff --git a/apache/tasks/apache-modules.yml b/apache/tasks/apache-modules.yml index 75bbed8..10b5333 100644 --- a/apache/tasks/apache-modules.yml +++ b/apache/tasks/apache-modules.yml @@ -20,9 +20,7 @@ - name: Load the apache ssl modules apache2_module: name={{ item }} state=present with_items: '{{ apache_ssl_modules }}' - when: - - apache_ssl_modules_enabled - - is_trusty + when: apache_ssl_modules_enabled notify: apache2 reload tags: [ 'apache', 'apache_mods' ]