diff --git a/tasks/setup.yml b/tasks/setup.yml index 4540dfc..7520ac0 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -1,8 +1,4 @@ --- -- name: Concat lists for proxy setup - set_fact: - droneci_no_proxy: "{{ __droneci_default_no_proxy }} + {{ droneci_no_proxy | default([]) }}" - - block: - name: Ensure service directory exists file: diff --git a/templates/services/droneci_compose.yml.j2 b/templates/services/droneci_compose.yml.j2 index 60fad1d..a51e79e 100644 --- a/templates/services/droneci_compose.yml.j2 +++ b/templates/services/droneci_compose.yml.j2 @@ -1,6 +1,6 @@ #jinja2:lstrip_blocks: True {{ ansible_managed | comment }} -version: "2" +version: "2.4" services: droneci: diff --git a/vars/main.yml b/vars/main.yml deleted file mode 100644 index 0b18f80..0000000 --- a/vars/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -__droneci_default_no_proxy: - - droneserver - - droneagent