From c37d51d236c444055b7d2bc94ca546ccb0104d5b Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Thu, 8 Apr 2021 12:17:07 -0400
Subject: [PATCH] proxies/debuginfod: allow proxyopts

debuginfod can take O(60s) to run certain webapi queries, so the httpd
mod_proxy default timeouts are too short.  Introduce an ansible
variable "proxyopts", expanded into the httpd ProxyPass and
ProxyPassReverse configuration lines.  Default to "", but set it
with pretty generous limits for debuginfod only.
---
 playbooks/include/proxies-reverseproxy.yml               | 1 +
 roles/httpd/reverseproxy/tasks/main.yml                  | 1 +
 roles/httpd/reverseproxy/templates/reversepassproxy.conf | 4 ++--
 roles/httpd/reverseproxy/vars/main.yml                   | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 74afa85e09..867bb724fa 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -754,5 +754,6 @@
     remotepath: /
     localpath: /
     proxyurl: http://debuginfod01:8002
+    proxyopts: "connectiontimeout=600 timeout=600 keepalive=on"
     tags: debuginfod
 
diff --git a/roles/httpd/reverseproxy/tasks/main.yml b/roles/httpd/reverseproxy/tasks/main.yml
index 23e37d9399..9ed5604877 100644
--- a/roles/httpd/reverseproxy/tasks/main.yml
+++ b/roles/httpd/reverseproxy/tasks/main.yml
@@ -5,6 +5,7 @@
 # - proxyurl
 # - rewrite
 # - keephost
+# - proxyopts
 
 - name: Set OpenShift information if not preconfigured
   set_fact:
diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.conf
index 2c3a2dd956..148175b004 100644
--- a/roles/httpd/reverseproxy/templates/reversepassproxy.conf
+++ b/roles/httpd/reverseproxy/templates/reversepassproxy.conf
@@ -64,6 +64,6 @@ RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P]
 ProxyPass {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}"
 ProxyPassReverse {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}"
 {% else %}
-ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
-ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
+ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} {{ proxyopts }}
+ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {{ proxyopts }}
 {% endif %}
diff --git a/roles/httpd/reverseproxy/vars/main.yml b/roles/httpd/reverseproxy/vars/main.yml
index 7bf5f2354f..d88f2e67d1 100644
--- a/roles/httpd/reverseproxy/vars/main.yml
+++ b/roles/httpd/reverseproxy/vars/main.yml
@@ -7,3 +7,4 @@ header_scheme: false
 keephost: false
 targettype: plain
 http_not_https_yes_this_is_insecure_and_i_feel_bad: false
+proxyopts: ""