From 50b61315eb65fe0b84fd4301755546ce46b33483 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Sun, 25 Nov 2018 15:08:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=87=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=80=D0=BE=D0=BB=D0=B8=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D1=83=D1=80=D0=BE=D0=B2=D0=B5?= =?UTF-8?q?=D0=BD=D1=8C=20=D0=B2=D0=B2=D0=B5=D1=80=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/amber.yml | 2 +- ansible/roles/docker-app/meta/main.yml | 2 -- ansible/roles/docker-app/tasks/main.yml | 2 +- .../roles/{nginx-web-proxy => nginx-proxy}/defaults/main.yml | 0 ansible/roles/{nginx-web-proxy => nginx-proxy}/tasks/main.yml | 2 +- ansible/roles/{blocks => }/owner/defaults/main.yml | 0 ansible/roles/{blocks => }/owner/tasks/main.yml | 0 ansible/roles/{blocks => }/owner/templates/env.j2 | 0 ansible/roles/{blocks => }/ssl-certificate/defaults/main.yml | 0 .../roles/{blocks => }/ssl-certificate/tasks/letsencrypt.yml | 0 ansible/roles/{blocks => }/ssl-certificate/tasks/main.yml | 0 .../roles/{blocks => }/ssl-certificate/tasks/self-signed.yml | 0 .../roles/{blocks => }/ssl-certificate/templates/vhost.conf.j2 | 0 13 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 ansible/roles/docker-app/meta/main.yml rename ansible/roles/{nginx-web-proxy => nginx-proxy}/defaults/main.yml (100%) rename ansible/roles/{nginx-web-proxy => nginx-proxy}/tasks/main.yml (94%) rename ansible/roles/{blocks => }/owner/defaults/main.yml (100%) rename ansible/roles/{blocks => }/owner/tasks/main.yml (100%) rename ansible/roles/{blocks => }/owner/templates/env.j2 (100%) rename ansible/roles/{blocks => }/ssl-certificate/defaults/main.yml (100%) rename ansible/roles/{blocks => }/ssl-certificate/tasks/letsencrypt.yml (100%) rename ansible/roles/{blocks => }/ssl-certificate/tasks/main.yml (100%) rename ansible/roles/{blocks => }/ssl-certificate/tasks/self-signed.yml (100%) rename ansible/roles/{blocks => }/ssl-certificate/templates/vhost.conf.j2 (100%) diff --git a/ansible/amber.yml b/ansible/amber.yml index 9b19c7f..7181e1c 100644 --- a/ansible/amber.yml +++ b/ansible/amber.yml @@ -43,7 +43,7 @@ loop_var: app_item - include_role: - name: nginx-web-proxy + name: nginx-proxy private: yes vars: nginx_proxy_name: '{{ fr_item.name }}' diff --git a/ansible/roles/docker-app/meta/main.yml b/ansible/roles/docker-app/meta/main.yml deleted file mode 100644 index cd21505..0000000 --- a/ansible/roles/docker-app/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- - diff --git a/ansible/roles/docker-app/tasks/main.yml b/ansible/roles/docker-app/tasks/main.yml index d454b76..cb8e41f 100644 --- a/ansible/roles/docker-app/tasks/main.yml +++ b/ansible/roles/docker-app/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Create owner. include_role: - name: blocks/owner + name: owner vars: owner_name: '{{ username }}' owner_group: '{{ username }}' diff --git a/ansible/roles/nginx-web-proxy/defaults/main.yml b/ansible/roles/nginx-proxy/defaults/main.yml similarity index 100% rename from ansible/roles/nginx-web-proxy/defaults/main.yml rename to ansible/roles/nginx-proxy/defaults/main.yml diff --git a/ansible/roles/nginx-web-proxy/tasks/main.yml b/ansible/roles/nginx-proxy/tasks/main.yml similarity index 94% rename from ansible/roles/nginx-web-proxy/tasks/main.yml rename to ansible/roles/nginx-proxy/tasks/main.yml index c28b07f..0ad8890 100644 --- a/ansible/roles/nginx-web-proxy/tasks/main.yml +++ b/ansible/roles/nginx-proxy/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "Configure ssl certificate for {{ nginx_proxy_name }}" include_role: - name: blocks/ssl-certificate + name: ssl-certificate vars: cert_type: '{{ nginx_ssl_type }}' cert_name: '{{ nginx_ssl_name }}' diff --git a/ansible/roles/blocks/owner/defaults/main.yml b/ansible/roles/owner/defaults/main.yml similarity index 100% rename from ansible/roles/blocks/owner/defaults/main.yml rename to ansible/roles/owner/defaults/main.yml diff --git a/ansible/roles/blocks/owner/tasks/main.yml b/ansible/roles/owner/tasks/main.yml similarity index 100% rename from ansible/roles/blocks/owner/tasks/main.yml rename to ansible/roles/owner/tasks/main.yml diff --git a/ansible/roles/blocks/owner/templates/env.j2 b/ansible/roles/owner/templates/env.j2 similarity index 100% rename from ansible/roles/blocks/owner/templates/env.j2 rename to ansible/roles/owner/templates/env.j2 diff --git a/ansible/roles/blocks/ssl-certificate/defaults/main.yml b/ansible/roles/ssl-certificate/defaults/main.yml similarity index 100% rename from ansible/roles/blocks/ssl-certificate/defaults/main.yml rename to ansible/roles/ssl-certificate/defaults/main.yml diff --git a/ansible/roles/blocks/ssl-certificate/tasks/letsencrypt.yml b/ansible/roles/ssl-certificate/tasks/letsencrypt.yml similarity index 100% rename from ansible/roles/blocks/ssl-certificate/tasks/letsencrypt.yml rename to ansible/roles/ssl-certificate/tasks/letsencrypt.yml diff --git a/ansible/roles/blocks/ssl-certificate/tasks/main.yml b/ansible/roles/ssl-certificate/tasks/main.yml similarity index 100% rename from ansible/roles/blocks/ssl-certificate/tasks/main.yml rename to ansible/roles/ssl-certificate/tasks/main.yml diff --git a/ansible/roles/blocks/ssl-certificate/tasks/self-signed.yml b/ansible/roles/ssl-certificate/tasks/self-signed.yml similarity index 100% rename from ansible/roles/blocks/ssl-certificate/tasks/self-signed.yml rename to ansible/roles/ssl-certificate/tasks/self-signed.yml diff --git a/ansible/roles/blocks/ssl-certificate/templates/vhost.conf.j2 b/ansible/roles/ssl-certificate/templates/vhost.conf.j2 similarity index 100% rename from ansible/roles/blocks/ssl-certificate/templates/vhost.conf.j2 rename to ansible/roles/ssl-certificate/templates/vhost.conf.j2