Unified config and variable use

Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens 2020-01-31 19:15:05 +01:00
parent a3247a6aff
commit 81f4b2a471
5 changed files with 3 additions and 6 deletions

View File

@ -1,5 +1,3 @@
---
admin_mail: admin@example.com
ssh_user: ssh_login
nextcloud_domain: nextcloud.com
collabora_domain: office.nextcloud.com

View File

@ -1,6 +1,5 @@
---
dependencies:
- role: common
- role: docker
- role: apache
- role: letsencrypt
- role: docker

View File

@ -1,7 +1,7 @@
---
- name: add drone http site
template:
src: etc/apache2/sites-available/ci_domain.conf.j2
src: etc/apache2/sites-available/ansible_domain.conf.j2
dest: /etc/apache2/sites-available/{{ ci_domain}}.conf
owner: root
group: root
@ -26,7 +26,7 @@
when: ansible_domain == 'dev'
- name: add drone https site
template:
src: etc/apache2/sites-available/ci_domain-le-ssl.conf.j2
src: etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2
dest: /etc/apache2/sites-available/{{ ci_domain }}-le-ssl.conf
owner: root
group: root