From 3c97ce5f93c1723f5766c55f29976435e49b1489 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sun, 25 Nov 2018 15:26: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=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/amber.yml                       |  2 +-
 ansible/roles/docker-app/tasks/main.yml |  2 +-
 ansible/roles/owner/tasks/main.yml      |  6 +++---
 ansible/roles/owner/templates/env.j2    |  4 ++--
 ansible/templates/vakhrushev.me.conf.j2 | 11 ++++++++---
 ansible/vars/apps.yml                   |  6 ++++--
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ansible/amber.yml b/ansible/amber.yml
index 7181e1c..7fc103f 100644
--- a/ansible/amber.yml
+++ b/ansible/amber.yml
@@ -37,7 +37,7 @@
       vars:
         username: '{{ app_item.username }}'
         ssh_keys: '{{ app_item.ssh_keys | default([]) }}'
-        envs: '{{ app_item.envs | default({}) }}'
+        env: '{{ app_item.env | default({}) }}'
       with_items: '{{ apps }}'
       loop_control:
         loop_var: app_item
diff --git a/ansible/roles/docker-app/tasks/main.yml b/ansible/roles/docker-app/tasks/main.yml
index cb8e41f..38bd521 100644
--- a/ansible/roles/docker-app/tasks/main.yml
+++ b/ansible/roles/docker-app/tasks/main.yml
@@ -6,4 +6,4 @@
     owner_name: '{{ username }}'
     owner_group: '{{ username }}'
     owner_ssh_keys: '{{ ssh_keys | default([]) }}'
-    owner_envs: '{{ env | default({}) }}'
+    owner_env: '{{ env | default({}) }}'
diff --git a/ansible/roles/owner/tasks/main.yml b/ansible/roles/owner/tasks/main.yml
index 0eb2cd3..72702c5 100644
--- a/ansible/roles/owner/tasks/main.yml
+++ b/ansible/roles/owner/tasks/main.yml
@@ -35,10 +35,10 @@
     path: '/home/{{ owner_name }}/.bashrc'
     regexp: '^export {{ item.key }}='
     state: absent
-  with_dict: '{{ owner_envs }}'
+  with_dict: '{{ owner_env }}'
 
 - name: 'Include environment variables for user "{{ owner_name }}" in bashrc.'
   lineinfile:
     path: '/home/{{ owner_name }}/.bashrc'
-    regexp: '^\. ~\/\.env'
-    line: '. ~/.env'
+    regexp: '^export \$\(grep -v'
+    line: 'export $(grep -v "^#" "$HOME"/.env | xargs)'
diff --git a/ansible/roles/owner/templates/env.j2 b/ansible/roles/owner/templates/env.j2
index cc8d14a..ad19075 100644
--- a/ansible/roles/owner/templates/env.j2
+++ b/ansible/roles/owner/templates/env.j2
@@ -1,3 +1,3 @@
-{% for name, value in owner_envs.iteritems() %}
-export {{ name }}={{ value }}
+{% for name, value in owner_env.iteritems() %}
+{{ name }}={{ value }}
 {% endfor %}
diff --git a/ansible/templates/vakhrushev.me.conf.j2 b/ansible/templates/vakhrushev.me.conf.j2
index 07f6f5d..a934096 100755
--- a/ansible/templates/vakhrushev.me.conf.j2
+++ b/ansible/templates/vakhrushev.me.conf.j2
@@ -1,11 +1,16 @@
 server {
-    server_name www.vakhrushev.me;
-    return 301 $scheme://vakhrushev.me$request_uri;
+    server_name docker.vakhrushev.me;
+    return 301 https://docker.vakhrushev.me$request_uri;
+}
+
+server {
+    server_name www.docker.vakhrushev.me;
+    return 301 https://docker.vakhrushev.me$request_uri;
 }
 
 server {
     listen 443 ssl http2;
-    server_name vakhrushev.me;
+    server_name docker.vakhrushev.me;
 
     ssl on;
     ssl_certificate         {{ vars[nginx_ssl_name + "_ssl_certificate"] }};
diff --git a/ansible/vars/apps.yml b/ansible/vars/apps.yml
index d5ebaab..41edcfe 100644
--- a/ansible/vars/apps.yml
+++ b/ansible/vars/apps.yml
@@ -8,6 +8,8 @@ apps:
     username: homepage
     ssh_keys:
       - '{{ lookup("file", "av_id_rsa.pub") }}'
+    env:
+      NGINX_PORT: 16002
 
 
 # Конфигурации nginx
@@ -21,5 +23,5 @@ frontends:
     ssl_type: self-signed
     ssl_email: anwinged@ya.ru
     ssl_domains:
-      - vakhrushev.me
-      - www.vakhrushev.me
+      - docker.vakhrushev.me
+      - www.docker.vakhrushev.me