Improved variables

- removed default variables with unusable values
- exchanged ansible_domain with collabora_domain where applicable
This commit is contained in:
2020-01-04 01:06:10 +01:00
parent ec49e08643
commit 5e9393a4b9
6 changed files with 16 additions and 20 deletions
+4 -4
View File
@@ -2,7 +2,7 @@
- name: add collabora http site
template:
src: etc/apache2/sites-available/ansible_domain.conf.j2
dest: /etc/apache2/sites-available/{{ ansible_domain }}.conf
dest: /etc/apache2/sites-available/{{ collabora_domain }}.conf
owner: root
group: root
mode: 0644
@@ -13,7 +13,7 @@
cmd: a2dissite 000-default.conf
- name: enable collabora site
command:
cmd: a2ensite {{ ansible_domain }}.conf
cmd: a2ensite {{ collabora_domain }}.conf
- name: run certbot
command:
cmd: certbot --apache --non-interactive --keep-until-expiring --no-eff-email --email {{ admin_mail }} --redirect --renew-with-new-domains --agree-tos -d {{ ansible_domain }}
@@ -23,11 +23,11 @@
- name: add collabora https site
template:
src: etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2
dest: /etc/apache2/sites-available/{{ ansible_domain }}-le-ssl.conf
dest: /etc/apache2/sites-available/{{ collabora_domain }}-le-ssl.conf
owner: root
group: root
mode: 0644
- name: enable collabora https site
command:
cmd: a2ensite {{ ansible_domain }}-le-ssl.conf
cmd: a2ensite {{ collabora_domain }}-le-ssl.conf
notify: restart apache