Изменена структура ролей для контейнеров

ansible/roles/blocks/nginx-proxy/defaults/main.yml

@@ -0,0 +1,5 @@
+---
+nginx_proxy_name: ''
+nginx_proxy_dir: '/var/www/{{ nginx_proxy_name }}'
+nginx_proxy_web_root: '{{ nginx_proxy_dir }}/current'
+nginx_proxy_template: site.conf.j2

ansible/roles/blocks/nginx-proxy/tasks/main.yml

@@ -0,0 +1,19 @@
+---
+- name: "Create nginx config for {{ nginx_proxy_name }} from {{ nginx_proxy_template }}."
+  template:
+    src: '{{ nginx_proxy_template }}'
+    dest: "/etc/nginx/sites-enabled/{{ nginx_proxy_name }}.conf"
+  notify: restart nginx
+  tags:
+    - webserver
+
+- name: "Create root folder for {{ nginx_proxy_name }}."
+  file:
+    path: "{{ nginx_proxy_dir }}"
+    state: directory
+    owner: "{{ deploy_user }}"
+    group: www-data
+    recurse: yes
+  notify: restart nginx
+  tags:
+    - webserver

ansible/roles/blocks/nginx-proxy/templates/site.conf.j2

@@ -0,0 +1,15 @@
+server {
+    server_name www.{{ nginx_proxy_domain }};
+    return 301 $scheme://{{ nginx_proxy_domain }}$request_uri;
+}
+
+server {
+    listen 80;
+    server_name {{ nginx_proxy_domain }};
+
+    location / {
+        root {{ nginx_proxy_web_root }};
+        index index.html;
+        try_files $uri $uri/ =404;
+    }
+}

ansible/roles/blocks/owner/tasks/main.yml

@@ -25,8 +25,10 @@
 
 - name: 'Set up environment variables for user "{{ owner_name }}".'
   template:
-    src: envs.j2
-    dest: '/home/{{ owner_name }}/.envs'
+    src: env.j2
+    dest: '/home/{{ owner_name }}/.env'
+    owner: '{{ owner_name }}'
+    group: '{{ owner_group }}'
 
 - name: 'Remove absent environment variables for user "{{ owner_name }}" from bashrc.'
   lineinfile:
@@ -38,5 +40,5 @@
 - name: 'Include environment variables for user "{{ owner_name }}" in bashrc.'
   lineinfile:
     path: '/home/{{ owner_name }}/.bashrc'
-    regexp: '^\. ~\/\.envs'
-    line: '. ~/.envs'
+    regexp: '^\. ~\/\.env'
+    line: '. ~/.env'

ansible/roles/docker-app/meta/main.yml

@@ -1,7 +1,2 @@
 ---
-dependencies:
-  - role: blocks/owner
-    owner_name: '{{ username }}'
-    owner_group: '{{ username }}'
-    owner_ssh_keys: '{{ ssh_keys | default([]) }}'
-    owner_envs: '{{ env | default({}) }}'
+

ansible/roles/docker-app/tasks/main.yml

@@ -1 +1,9 @@
 ---
+- name: Create owner.
+  include_role:
+    name: blocks/owner
+  vars:
+    owner_name: '{{ username }}'
+    owner_group: '{{ username }}'
+    owner_ssh_keys: '{{ ssh_keys | default([]) }}'
+    owner_envs: '{{ env | default({}) }}'

ansible/roles/nginx-web-proxy/defaults/main.yml

@@ -0,0 +1,9 @@
+---
+nginx_proxy_name: ''
+nginx_proxy_template: ''
+nginx_proxy_params: {}
+
+nginx_ssl_type: ~
+nginx_ssl_name: '{{ nginx_proxy_name }}'
+nginx_ssl_email: ''
+nginx_ssl_domains: []

ansible/roles/nginx-web-proxy/tasks/main.yml

@@ -0,0 +1,20 @@
+---
+- name: "Configure ssl certificate for {{ nginx_proxy_name }}"
+  include_role:
+    name: blocks/ssl-certificate
+  vars:
+    cert_type: '{{ nginx_ssl_type }}'
+    cert_name: '{{ nginx_ssl_name }}'
+    cert_email: '{{ nginx_ssl_email }}'
+    cert_domains: '{{ nginx_ssl_domains }}'
+  when: nginx_ssl_type is not none
+  tags:
+    - webserver
+
+- name: "Create nginx config for {{ nginx_proxy_name }} from {{ nginx_proxy_template }}."
+  template:
+    src: '{{ nginx_proxy_template }}'
+    dest: "/etc/nginx/sites-enabled/{{ nginx_proxy_name }}.conf"
+  notify: restart nginx
+  tags:
+    - webserver