Unified config and variable use
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
parent
a3247a6aff
commit
81f4b2a471
|
@ -1,5 +1,3 @@
|
||||||
---
|
---
|
||||||
admin_mail: admin@example.com
|
|
||||||
ssh_user: ssh_login
|
|
||||||
nextcloud_domain: nextcloud.com
|
nextcloud_domain: nextcloud.com
|
||||||
collabora_domain: office.nextcloud.com
|
collabora_domain: office.nextcloud.com
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
---
|
---
|
||||||
dependencies:
|
dependencies:
|
||||||
- role: common
|
- role: docker
|
||||||
- role: apache
|
- role: apache
|
||||||
- role: letsencrypt
|
- role: letsencrypt
|
||||||
- role: docker
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
- name: add drone http site
|
- name: add drone http site
|
||||||
template:
|
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
|
dest: /etc/apache2/sites-available/{{ ci_domain}}.conf
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
when: ansible_domain == 'dev'
|
when: ansible_domain == 'dev'
|
||||||
- name: add drone https site
|
- name: add drone https site
|
||||||
template:
|
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
|
dest: /etc/apache2/sites-available/{{ ci_domain }}-le-ssl.conf
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
|
|
Loading…
Reference in New Issue