From dafa3685ceb398fcda7995d58db2596de4fa24aa Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 2 Jan 2021 17:04:53 +0100 Subject: [PATCH] [nginx] Copy 401 error page if we use credentials Signed-off-by: Yohann D'ANELLO --- group_vars/mailman.yml | 6 +++--- roles/nginx/tasks/main.yml | 7 +++++++ .../custom_401.html.j2 => nginx/templates/www/401.html.j2} | 0 3 files changed, 10 insertions(+), 3 deletions(-) rename roles/{nginx-mailman/templates/var/www/custom_401.html.j2 => nginx/templates/www/401.html.j2} (100%) diff --git a/group_vars/mailman.yml b/group_vars/mailman.yml index 1eac28df..4a70e7f4 100644 --- a/group_vars/mailman.yml +++ b/group_vars/mailman.yml @@ -17,7 +17,7 @@ loc_nginx: - filter: "/error/" params: - "internal" - - "alias /var/www" + - "alias /var/www/html" - filter: "/create" params: - "default_type text/html" @@ -34,7 +34,7 @@ loc_nginx: - "deny all" - "auth_basic \"On n'aime pas les spambots, donc on a mis un mot de passe. Le login est Stop et le mot de passe est Spam.\"" - "auth_basic_user_file /etc/nginx/passwd" - - "error_page 401 /error/custom_401.html" + - "error_page 401 /error/401.html" - filter: "~ ^/admin" params: - "satisfy any" @@ -44,7 +44,7 @@ loc_nginx: - "deny all" - "auth_basic \"On n'aime pas les spambots, donc on a mis un mot de passe. Le login est Stop et le mot de passe est Spam.\"" - "auth_basic_user_file /etc/nginx/passwd" - - "error_page 401 /error/custom_401.html" + - "error_page 401 /error/401.html" - filter: "/images/mailman" params: - "alias /usr/share/images/mailman" diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 11cf30ad..159f5cf9 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -78,7 +78,14 @@ mode: 0755 - name: Install passwords + when: nginx.auth_passwd|length > 0 template: src: nginx/passwd.j2 dest: /etc/nginx/passwd mode: 0644 + +- name: Copy 401 error page + when: nginx.auth_passwd|length > 0 + template: + src: www/html/401.html.j2 + dest: /var/www/html/401.html diff --git a/roles/nginx-mailman/templates/var/www/custom_401.html.j2 b/roles/nginx/templates/www/401.html.j2 similarity index 100% rename from roles/nginx-mailman/templates/var/www/custom_401.html.j2 rename to roles/nginx/templates/www/401.html.j2