From 0a321b59ae67f6c3b8888a63d4e20d390d411477 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Fri, 14 Jun 2019 14:35:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20Caddy-=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/amber.yml | 25 +++++++++++++++---------- ansible/requirements.yml | 3 +++ ansible/templates/Caddyfile.j2 | 0 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 ansible/templates/Caddyfile.j2 diff --git a/ansible/amber.yml b/ansible/amber.yml index ed903d1..dd068bb 100644 --- a/ansible/amber.yml +++ b/ansible/amber.yml @@ -35,13 +35,18 @@ vars: docker_users: '{{ apps | map(attribute="username") | list }}' - - include_role: - name: docker-app - private: yes - vars: - username: '{{ app_item.username }}' - ssh_keys: '{{ app_item.ssh_keys | default([]) }}' - env: '{{ app_item.env | default({}) }}' - with_items: '{{ apps }}' - loop_control: - loop_var: app_item + - include_role: + name: antoiner77.caddy + vars: + caddy_config: '{{ lookup("template", "templates/Caddyfile.j2") }}' + +# - include_role: +# name: docker-app +# private: yes +# vars: +# username: '{{ app_item.username }}' +# ssh_keys: '{{ app_item.ssh_keys | default([]) }}' +# env: '{{ app_item.env | default({}) }}' +# with_items: '{{ apps }}' +# loop_control: +# loop_var: app_item diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 4b504a0..7e4d470 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -7,3 +7,6 @@ - src: geerlingguy.docker version: 2.5.2 + +- src: antoiner77.caddy + version: v2.1.0 diff --git a/ansible/templates/Caddyfile.j2 b/ansible/templates/Caddyfile.j2 new file mode 100644 index 0000000..e69de29