diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.conf-nonopenshift-iad2 b/roles/httpd/reverseproxy/templates/reversepassproxy.conf-nonopenshift-iad2 new file mode 100644 index 0000000000..1ba6aba53f --- /dev/null +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.conf-nonopenshift-iad2 @@ -0,0 +1,64 @@ +{% if 'iad2' in inventory_hostname %} +{% if rewrite %} +RewriteEngine On +RewriteRule ^{{remotepath}}$ %{REQUEST_URI}/ [R=301] + +{% endif %} +{% if header_scheme %} +RequestHeader set X-Forwarded-Scheme https early +RequestHeader set X-Scheme https early +RequestHeader set X-Forwarded-Proto https early + +{% endif %} +{% if header_expect %} +RequestHeader unset Expect early + +{% endif %} +{% if keephost %} +ProxyPreserveHost On +{% endif %} + +{% if balancer_name is defined %} +SSLProxyEngine On + + + {% for member in balancer_members %} + {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} + {% if remotepath is defined and remotepath != "/" %} + BalancerMember "ws://{{ member }}{{ remotepath }}" + {% else %} + BalancerMember "ws://{{ member }}" + {% endif %} + {% else %} + {% if remotepath is defined and remotepath != "/" %} + BalancerMember "wss://{{ member }}{{ remotepath }}" + {% else %} + BalancerMember "wss://{{ member }}" + {% endif %} + {% endif %} + {% endfor %} + + +RewriteEngine on +RewriteCond %{HTTP:Upgrade} ^WebSocket$ [NC] +RewriteCond %{HTTP:Connection} Upgrade [NC] +{% if remotepath is defined and remotepath != "/" %} +RewriteCond %{REQUEST_URI} ^{{ remotepath }}/(.)* +{% endif %} +RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P] + + + {% for member in balancer_members %} + {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} + BalancerMember "http://{{ member }}" + {% else %} + BalancerMember "https://{{ member }}" + {% endif %} + {% endfor %} + +ProxyPass {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" +ProxyPassReverse {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" +{% endif %} +{% else %} +Redirect 421 / +{% endif %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf index 2724dc9e82..a904664b41 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.koji.conf @@ -4,8 +4,4 @@ ProxyPreserveHost On ProxyTimeout 10800 TimeOut 10800 -{% if 'iad2' in inventory_hostname %} -{% include "reversepassproxy.conf" %} -{% else %} -Redirect 421 / -{% endif %} +{% include "reversepassproxy.conf-nonopenshift-iad2" %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.openqa.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.openqa.conf index 1ba6aba53f..3565012c15 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.openqa.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.openqa.conf @@ -1,64 +1 @@ -{% if 'iad2' in inventory_hostname %} -{% if rewrite %} -RewriteEngine On -RewriteRule ^{{remotepath}}$ %{REQUEST_URI}/ [R=301] - -{% endif %} -{% if header_scheme %} -RequestHeader set X-Forwarded-Scheme https early -RequestHeader set X-Scheme https early -RequestHeader set X-Forwarded-Proto https early - -{% endif %} -{% if header_expect %} -RequestHeader unset Expect early - -{% endif %} -{% if keephost %} -ProxyPreserveHost On -{% endif %} - -{% if balancer_name is defined %} -SSLProxyEngine On - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "ws://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "ws://{{ member }}" - {% endif %} - {% else %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "wss://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "wss://{{ member }}" - {% endif %} - {% endif %} - {% endfor %} - - -RewriteEngine on -RewriteCond %{HTTP:Upgrade} ^WebSocket$ [NC] -RewriteCond %{HTTP:Connection} Upgrade [NC] -{% if remotepath is defined and remotepath != "/" %} -RewriteCond %{REQUEST_URI} ^{{ remotepath }}/(.)* -{% endif %} -RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P] - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - BalancerMember "http://{{ member }}" - {% else %} - BalancerMember "https://{{ member }}" - {% endif %} - {% endfor %} - -ProxyPass {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -ProxyPassReverse {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -{% endif %} -{% else %} -Redirect 421 / -{% endif %} +{% include "reversepassproxy.conf-nonopenshift-iad2" %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf index 1ba6aba53f..3565012c15 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdb.conf @@ -1,64 +1 @@ -{% if 'iad2' in inventory_hostname %} -{% if rewrite %} -RewriteEngine On -RewriteRule ^{{remotepath}}$ %{REQUEST_URI}/ [R=301] - -{% endif %} -{% if header_scheme %} -RequestHeader set X-Forwarded-Scheme https early -RequestHeader set X-Scheme https early -RequestHeader set X-Forwarded-Proto https early - -{% endif %} -{% if header_expect %} -RequestHeader unset Expect early - -{% endif %} -{% if keephost %} -ProxyPreserveHost On -{% endif %} - -{% if balancer_name is defined %} -SSLProxyEngine On - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "ws://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "ws://{{ member }}" - {% endif %} - {% else %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "wss://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "wss://{{ member }}" - {% endif %} - {% endif %} - {% endfor %} - - -RewriteEngine on -RewriteCond %{HTTP:Upgrade} ^WebSocket$ [NC] -RewriteCond %{HTTP:Connection} Upgrade [NC] -{% if remotepath is defined and remotepath != "/" %} -RewriteCond %{REQUEST_URI} ^{{ remotepath }}/(.)* -{% endif %} -RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P] - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - BalancerMember "http://{{ member }}" - {% else %} - BalancerMember "https://{{ member }}" - {% endif %} - {% endfor %} - -ProxyPass {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -ProxyPassReverse {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -{% endif %} -{% else %} -Redirect 421 / -{% endif %} +{% include "reversepassproxy.conf-nonopenshift-iad2" %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf index 1ba6aba53f..3565012c15 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.taskotron-resultsdbapi.conf @@ -1,64 +1 @@ -{% if 'iad2' in inventory_hostname %} -{% if rewrite %} -RewriteEngine On -RewriteRule ^{{remotepath}}$ %{REQUEST_URI}/ [R=301] - -{% endif %} -{% if header_scheme %} -RequestHeader set X-Forwarded-Scheme https early -RequestHeader set X-Scheme https early -RequestHeader set X-Forwarded-Proto https early - -{% endif %} -{% if header_expect %} -RequestHeader unset Expect early - -{% endif %} -{% if keephost %} -ProxyPreserveHost On -{% endif %} - -{% if balancer_name is defined %} -SSLProxyEngine On - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "ws://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "ws://{{ member }}" - {% endif %} - {% else %} - {% if remotepath is defined and remotepath != "/" %} - BalancerMember "wss://{{ member }}{{ remotepath }}" - {% else %} - BalancerMember "wss://{{ member }}" - {% endif %} - {% endif %} - {% endfor %} - - -RewriteEngine on -RewriteCond %{HTTP:Upgrade} ^WebSocket$ [NC] -RewriteCond %{HTTP:Connection} Upgrade [NC] -{% if remotepath is defined and remotepath != "/" %} -RewriteCond %{REQUEST_URI} ^{{ remotepath }}/(.)* -{% endif %} -RewriteRule .* "balancer://{{ balancer_name }}-websocket%{REQUEST_URI}" [P] - - - {% for member in balancer_members %} - {% if http_not_https_yes_this_is_insecure_and_i_feel_bad %} - BalancerMember "http://{{ member }}" - {% else %} - BalancerMember "https://{{ member }}" - {% endif %} - {% endfor %} - -ProxyPass {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -ProxyPassReverse {{ localpath }} "balancer://{{balancer_name}}{{remotepath}}" -{% endif %} -{% else %} -Redirect 421 / -{% endif %} +{% include "reversepassproxy.conf-nonopenshift-iad2" %}