From 853102ee3730bf3ceec6b80c4be4ddc5718cbf2a Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Fri, 14 Jun 2019 14:52:54 +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=D0=B0=20=D1=80=D0=BE=D0=BB=D1=8C=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/amber.yml     | 19 +++++++++----------
 ansible/vars/apps.yml | 17 +----------------
 2 files changed, 10 insertions(+), 26 deletions(-)

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