From 0eaee6c78fb7f2d9ce3ec685527b60767405d2b4 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Sat, 2 Jan 2021 17:00:21 +0100
Subject: [PATCH] [nginx] Copy robots.txt
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/mailman.yml | 1 +
roles/nginx-mailman/tasks/main.yml | 2 --
roles/nginx/tasks/main.yml | 6 ++++++
.../var/www => nginx/templates/www/html}/robots.txt.j2 | 0
4 files changed, 7 insertions(+), 2 deletions(-)
rename roles/{nginx-mailman/templates/var/www => nginx/templates/www/html}/robots.txt.j2 (100%)
diff --git a/group_vars/mailman.yml b/group_vars/mailman.yml
index ce6c454e..1eac28df 100644
--- a/group_vars/mailman.yml
+++ b/group_vars/mailman.yml
@@ -4,6 +4,7 @@ loc_nginx:
default_ssl_server: lists.crans.org
auth_passwd:
Stop: "$apr1$NXaV5H7Q$J3ora3Jo5h775Y1nm93PN1"
+ deploy_robots_file: true
servers:
- server_name:
- lists.crans.org
diff --git a/roles/nginx-mailman/tasks/main.yml b/roles/nginx-mailman/tasks/main.yml
index f74b3f0f..b381b1ab 100644
--- a/roles/nginx-mailman/tasks/main.yml
+++ b/roles/nginx-mailman/tasks/main.yml
@@ -6,8 +6,6 @@
loop:
- src: nginx/snippets/fastcgi-mailman.conf.j2
dest: /etc/nginx/snippets/fastcgi-mailman.conf
- - src: var/www/robots.txt.j2
- dest: /var/www/robots.txt
- src: var/www/custom_401.html.j2
dest: /var/www/custom_401.html
notify: Reload nginx
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 61b69322..11cf30ad 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -65,6 +65,12 @@
src: www/html/50x.html.j2
dest: /var/www/html/50x.html
+- name: Copy robots.txt file
+ when: nginx.deploy_robots_file
+ template:
+ src: www/html/robots.txt.j2
+ dest: /var/www/html/robots.txt
+
- name: Indicate role in motd
template:
src: update-motd.d/05-service.j2
diff --git a/roles/nginx-mailman/templates/var/www/robots.txt.j2 b/roles/nginx/templates/www/html/robots.txt.j2
similarity index 100%
rename from roles/nginx-mailman/templates/var/www/robots.txt.j2
rename to roles/nginx/templates/www/html/robots.txt.j2
--
GitLab