From 86eff45e8b43d6251390ced770d34ab316f4a751 Mon Sep 17 00:00:00 2001
From: Dan Arnfield <dan@arnfield.com>
Date: Wed, 22 Jan 2020 15:33:20 -0600
Subject: [PATCH] uri.follow_redirects is now a string field

---
 roles/matrix-corporal/tasks/self_check_corporal.yml           | 2 +-
 roles/matrix-mxisd/tasks/self_check_mxisd.yml                 | 2 +-
 roles/matrix-nginx-proxy/tasks/self_check_well_known.yml      | 4 ++--
 roles/matrix-nginx-proxy/tasks/self_check_well_known_file.yml | 2 +-
 roles/matrix-riot-web/tasks/self_check_riot_web.yml           | 2 +-
 roles/matrix-synapse/tasks/self_check_client_api.yml          | 2 +-
 roles/matrix-synapse/tasks/self_check_federation_api.yml      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/matrix-corporal/tasks/self_check_corporal.yml b/roles/matrix-corporal/tasks/self_check_corporal.yml
index 03e91d8d6..d1561757c 100644
--- a/roles/matrix-corporal/tasks/self_check_corporal.yml
+++ b/roles/matrix-corporal/tasks/self_check_corporal.yml
@@ -6,7 +6,7 @@
 - name: Check Matrix Corporal HTTP gateway
   uri:
     url: "{{ corporal_client_api_url_endpoint_public }}"
-    follow_redirects: false
+    follow_redirects: none
     return_content: true
   register: result_corporal_client_api
   ignore_errors: true
diff --git a/roles/matrix-mxisd/tasks/self_check_mxisd.yml b/roles/matrix-mxisd/tasks/self_check_mxisd.yml
index 26dccb76f..137907bb3 100644
--- a/roles/matrix-mxisd/tasks/self_check_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/self_check_mxisd.yml
@@ -6,7 +6,7 @@
 - name: Check mxisd Identity Service
   uri:
     url: "{{ mxisd_url_endpoint_public }}"
-    follow_redirects: false
+    follow_redirects: none
     validate_certs: "{{ matrix_mxisd_self_check_validate_certificates }}"
   register: result_mxisd
   ignore_errors: true
diff --git a/roles/matrix-nginx-proxy/tasks/self_check_well_known.yml b/roles/matrix-nginx-proxy/tasks/self_check_well_known.yml
index 72be0f412..1e274ee36 100644
--- a/roles/matrix-nginx-proxy/tasks/self_check_well_known.yml
+++ b/roles/matrix-nginx-proxy/tasks/self_check_well_known.yml
@@ -6,7 +6,7 @@
       - path: /.well-known/matrix/client
         purpose: Client Discovery
         cors: true
-        follow_redirects: false
+        follow_redirects: none
         validate_certs: "{{ matrix_nginx_proxy_self_check_validate_certificates }}"
 
 - block:
@@ -15,7 +15,7 @@
           path: /.well-known/matrix/server
           purpose: Server Discovery
           cors: false
-          follow_redirects: true
+          follow_redirects: safe
           validate_certs: "{{ matrix_nginx_proxy_self_check_validate_certificates }}"
 
     - name: Determine domains that we require certificates for (mxisd)
diff --git a/roles/matrix-nginx-proxy/tasks/self_check_well_known_file.yml b/roles/matrix-nginx-proxy/tasks/self_check_well_known_file.yml
index 91dbcdc8d..e7a4cfac1 100644
--- a/roles/matrix-nginx-proxy/tasks/self_check_well_known_file.yml
+++ b/roles/matrix-nginx-proxy/tasks/self_check_well_known_file.yml
@@ -9,7 +9,7 @@
 - name: Check .well-known on the matrix hostname
   uri:
     url: "{{ well_known_url_matrix }}"
-    follow_redirects: false
+    follow_redirects: none
     return_content: true
     validate_certs: "{{ well_known_file_check.validate_certs }}"
   register: result_well_known_matrix
diff --git a/roles/matrix-riot-web/tasks/self_check_riot_web.yml b/roles/matrix-riot-web/tasks/self_check_riot_web.yml
index f16e210b7..1a845b3e5 100644
--- a/roles/matrix-riot-web/tasks/self_check_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/self_check_riot_web.yml
@@ -6,7 +6,7 @@
 - name: Check riot-web
   uri:
     url: "{{ riot_web_url_endpoint_public }}"
-    follow_redirects: false
+    follow_redirects: none
     validate_certs: "{{ matrix_riot_web_self_check_validate_certificates }}"
   register: result_riot_web
   ignore_errors: true
diff --git a/roles/matrix-synapse/tasks/self_check_client_api.yml b/roles/matrix-synapse/tasks/self_check_client_api.yml
index 50d0f4efc..fc691cc6d 100644
--- a/roles/matrix-synapse/tasks/self_check_client_api.yml
+++ b/roles/matrix-synapse/tasks/self_check_client_api.yml
@@ -3,7 +3,7 @@
 - name: Check Matrix Client API
   uri:
     url: "{{ matrix_synapse_client_api_url_endpoint_public }}"
-    follow_redirects: false
+    follow_redirects: none
     validate_certs: "{{ matrix_synapse_self_check_validate_certificates }}"
   register: result_matrix_synapse_client_api
   ignore_errors: true
diff --git a/roles/matrix-synapse/tasks/self_check_federation_api.yml b/roles/matrix-synapse/tasks/self_check_federation_api.yml
index b584cb351..fd4b338cc 100644
--- a/roles/matrix-synapse/tasks/self_check_federation_api.yml
+++ b/roles/matrix-synapse/tasks/self_check_federation_api.yml
@@ -3,7 +3,7 @@
 - name: Check Matrix Federation API
   uri:
     url: "{{ matrix_synapse_federation_api_url_endpoint_public }}"
-    follow_redirects: false
+    follow_redirects: none
     validate_certs: "{{ matrix_synapse_self_check_validate_certificates }}"
   register: result_matrix_synapse_federation_api
   ignore_errors: true