diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index c56d4d07d4..e655cfedd8 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -1010,6 +1010,16 @@ - pkgs.fedoraproject.org when: env == "production" and "phx2" in inventory_hostname + - role: httpd/website + site_name: pkgs.fedoraproject.org + ssl: true + sslonly: true + certbot: true + certbot_addhost: pkgs01.iad2.fedoraproject.org + tags: + - pkgs.fedoraproject.org + when: env == "production" and "iad2" in inventory_hostname + - role: httpd/website site_name: pkgs.stg.fedoraproject.org ssl: true diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf index 25abdb3c65..bb27cdb5ad 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.git.conf @@ -42,7 +42,7 @@ ProxyPreserveHost On Require valid-user -{% if 'phx2' in inventory_hostname %} +{% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {% else %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf index aededdb6cc..589f1fa981 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf @@ -31,7 +31,7 @@ ProxyPreserveHost On {% endif %} -{% if 'phx2' in inventory_hostname %} +{% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %} {% if balancer_name is defined %} diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf index b15a70c4b3..3f29cff144 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf @@ -1,4 +1,4 @@ -{% if 'phx2' in inventory_hostname %} +{% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} {% else %}