From 2c2e4a103d62b51dbcbf4868f585bd1f0a73ed5f Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Fri, 3 Jan 2020 22:14:33 +0100 Subject: [PATCH] Prevented execution of ssl tasks on VM --- roles/collabora/tasks/apache.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/roles/collabora/tasks/apache.yml b/roles/collabora/tasks/apache.yml index db0b426..3130652 100644 --- a/roles/collabora/tasks/apache.yml +++ b/roles/collabora/tasks/apache.yml @@ -6,6 +6,15 @@ owner: root group: root mode: 0644 + when: ansible_domain != 'dev' +- name: add development collabora http site + template: + src: etc/apache2/sites-available/dev.conf.j2 + dest: /etc/apache2/sites-available/{{ ansible_domain }}.conf + owner: root + group: root + mode: 0644 + when: ansible_domain == 'dev' - name: disable default site and enable collabora site block: - name: disable default site @@ -17,7 +26,8 @@ notify: reload apache - name: run certbot command: - cmd: certbot --apache --non-interactive --keep-until-expiring --no-eff-email --redirect --renew-with-new-domains --agree-tos -d {{ ansible_domain }} + cmd: certbot --apache --non-interactive --keep-until-expiring --no-eff-email --email {{ admin_mail }} --redirect --renew-with-new-domains --agree-tos -d {{ ansible_domain }} + when: ansible_domain != 'dev' - name: add collabora https site template: src: etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2 @@ -25,7 +35,9 @@ owner: root group: root mode: 0644 + when: ansible_domain != 'dev' - name: enable collabora https site command: cmd: a2ensite {{ ansible_domain }}-le-ssl.conf + when: ansible_domain != 'dev' notify: restart apache