From 81f4b2a471161aacc702cda043da6b24677e8769 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Fri, 31 Jan 2020 19:15:05 +0100 Subject: [PATCH] Unified config and variable use Signed-off-by: Jim Martens --- collabora_vars.yml.example | 2 -- roles/drone/meta/main.yml | 3 +-- roles/drone/tasks/apache.yml | 4 ++-- ...ci_domain-le-ssl.conf.j2 => ansible_domain-le-ssl.conf.j2} | 0 .../{ci_domain.conf.j2 => ansible_domain.conf.j2} | 0 5 files changed, 3 insertions(+), 6 deletions(-) rename roles/drone/templates/etc/apache2/sites-available/{ci_domain-le-ssl.conf.j2 => ansible_domain-le-ssl.conf.j2} (100%) rename roles/drone/templates/etc/apache2/sites-available/{ci_domain.conf.j2 => ansible_domain.conf.j2} (100%) diff --git a/collabora_vars.yml.example b/collabora_vars.yml.example index 5ce97d1..cba01a2 100644 --- a/collabora_vars.yml.example +++ b/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 diff --git a/roles/drone/meta/main.yml b/roles/drone/meta/main.yml index 670b25e..3821742 100644 --- a/roles/drone/meta/main.yml +++ b/roles/drone/meta/main.yml @@ -1,6 +1,5 @@ --- dependencies: - - role: common + - role: docker - role: apache - role: letsencrypt - - role: docker diff --git a/roles/drone/tasks/apache.yml b/roles/drone/tasks/apache.yml index d0b32cb..d7725f9 100644 --- a/roles/drone/tasks/apache.yml +++ b/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 diff --git a/roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2 b/roles/drone/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2 similarity index 100% rename from roles/drone/templates/etc/apache2/sites-available/ci_domain-le-ssl.conf.j2 rename to roles/drone/templates/etc/apache2/sites-available/ansible_domain-le-ssl.conf.j2 diff --git a/roles/drone/templates/etc/apache2/sites-available/ci_domain.conf.j2 b/roles/drone/templates/etc/apache2/sites-available/ansible_domain.conf.j2 similarity index 100% rename from roles/drone/templates/etc/apache2/sites-available/ci_domain.conf.j2 rename to roles/drone/templates/etc/apache2/sites-available/ansible_domain.conf.j2