Browse Source

Unified config and variable use

Signed-off-by: Jim Martens <github@2martens.de>
master
Jim Martens 2 years ago
parent
commit
81f4b2a471
  1. 2
      collabora_vars.yml.example
  2. 3
      roles/drone/meta/main.yml
  3. 4
      roles/drone/tasks/apache.yml
  4. 0
      roles/drone/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2
  5. 0
      roles/drone/templates/etc/apache2/sites-available/ansible_domain.conf.j2

2
collabora_vars.yml.example

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

3
roles/drone/meta/main.yml

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

4
roles/drone/tasks/apache.yml

@ -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

0
roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2 → roles/drone/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2

0
roles/drone/templates/etc/apache2/sites-available/ci_domain.conf.j2 → roles/drone/templates/etc/apache2/sites-available/ansible_domain.conf.j2

Loading…
Cancel
Save