diff --git a/ansible/amber.yml b/ansible/amber.yml index dd068bb..e7b6fb5 100644 --- a/ansible/amber.yml +++ b/ansible/amber.yml @@ -40,13 +40,12 @@ 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 + - include_role: + name: docker-app + 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/vars/apps.yml b/ansible/vars/apps.yml index 41edcfe..85c87e4 100644 --- a/ansible/vars/apps.yml +++ b/ansible/vars/apps.yml @@ -9,19 +9,4 @@ apps: ssh_keys: - '{{ lookup("file", "av_id_rsa.pub") }}' env: - NGINX_PORT: 16002 - - -# Конфигурации nginx -# Описывают конфиги nginx, сертификаты - -frontends: - - name: vakhrushev_me - template: vakhrushev.me.conf.j2 - params: - port: 16002 - ssl_type: self-signed - ssl_email: anwinged@ya.ru - ssl_domains: - - docker.vakhrushev.me - - www.docker.vakhrushev.me + DOCKER_PREFIX: homepage