From 0d2fd7d76c9c9bc6cea5e734a75c2ef00634ac80 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 20 Jan 2022 13:35:13 +0300
Subject: [PATCH] v5.4.0.0

Changelog: https://haproxy-wi.org/changelog.py#5_4_0
---
 app/scripts/ansible/roles/nginx_common/tasks/main.yml | 6 +++---
 app/scripts/ansible/roles/nginx_docker/tasks/main.yml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/scripts/ansible/roles/nginx_common/tasks/main.yml b/app/scripts/ansible/roles/nginx_common/tasks/main.yml
index a1c40d91..250e7961 100644
--- a/app/scripts/ansible/roles/nginx_common/tasks/main.yml
+++ b/app/scripts/ansible/roles/nginx_common/tasks/main.yml
@@ -53,7 +53,7 @@
 - name: Copy Nginx configuration in place
   template:
     src: default.conf.j2
-    dest: "{{nginx_dir}}/conf.d/default.conf"
+    dest: "{{nginx_dir}}/default.conf"
     mode: 0644
     force: no
   when: "'nginx' not in ansible_facts.packages"
@@ -62,7 +62,7 @@
 - name: Copying over nginx.conf
   template:
     src: nginx.conf.j2
-    dest: "{{ nginx_dir }}/nginx.conf"
+    dest: "/etc/nginx/nginx.conf"
     mode: "0666"
     force: no
     remote_src: true
@@ -72,7 +72,7 @@
 - name: Copying over mime.types
   template:
     src: mime.types.j2
-    dest: "{{ nginx_dir }}/mime.types"
+    dest: "/etc/nginx/mime.types"
     mode: "0666"
     force: no
     remote_src: true
diff --git a/app/scripts/ansible/roles/nginx_docker/tasks/main.yml b/app/scripts/ansible/roles/nginx_docker/tasks/main.yml
index b33d1d48..54b4403a 100644
--- a/app/scripts/ansible/roles/nginx_docker/tasks/main.yml
+++ b/app/scripts/ansible/roles/nginx_docker/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
-- name: Ensuring config directories exist
+- name: Ensuring nginx directories exist
   file:
-    path: "{{ nginx_dir }}"
+    path: "/etc/nginx"
     state: "directory"
     owner: "{{ansible_user}}"
     group: "{{ansible_user}}"
@@ -11,7 +11,7 @@
 
 - name: Ensuring conf.d directories exist
   file:
-    path: "{{ nginx_dir }}/conf.d"
+    path: "{{ nginx_dir }}"
     state: "directory"
     owner: "{{ansible_user}}"
     group: "{{ansible_user}}"
@@ -21,7 +21,7 @@
 
 - name: Ensuring sites-enabled directories exist
   file:
-    path: "{{ nginx_dir }}/sites-enabled"
+    path: "/etc/nginx/sites-enabled"
     state: "directory"
     owner: "{{ansible_user}}"
     group: "{{ansible_user}}"