Добавлен конфиг для тестирования

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

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({}) }}'

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'
+    regexp: '^export \$\(grep -v'
-    line: '. ~/.env'
+    line: 'export $(grep -v "^#" "$HOME"/.env | xargs)'

ansible/roles/owner/templates/env.j2

@@ -1,3 +1,3 @@
-{% for name, value in owner_envs.iteritems() %}
+{% for name, value in owner_env.iteritems() %}
-export {{ name }}={{ value }}
+{{ name }}={{ value }}
 {% endfor %}

ansible/templates/vakhrushev.me.conf.j2

@@ -1,11 +1,16 @@
 server {
-    server_name www.vakhrushev.me;
+    server_name docker.vakhrushev.me;
-    return 301 $scheme://vakhrushev.me$request_uri;
+    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"] }};

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
+      - docker.vakhrushev.me
-      - www.vakhrushev.me
+      - www.docker.vakhrushev.me