Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

iad2: adjust more proxy things for iad2: kojipkgs, nagios and certbot for pkgs

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-05-27 21:13:55 -07:00
parent 7bbd1bd030
commit 7f6cdda0b2
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
playbooks/include/proxies-websites.yml
View file

@ -1010,6 +1010,16 @@
- pkgs.fedoraproject.org - pkgs.fedoraproject.org
when: env == "production" and "phx2" in inventory_hostname 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 - role: httpd/website
site_name: pkgs.stg.fedoraproject.org site_name: pkgs.stg.fedoraproject.org
ssl: true ssl: true

2
roles/httpd/reverseproxy/templates/reversepassproxy.git.conf
View file

@ -42,7 +42,7 @@ ProxyPreserveHost On
Require valid-user Require valid-user
</Location> </Location>
{% if 'phx2' in inventory_hostname %} {% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %}
ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
{% else %} {% else %}

2
roles/httpd/reverseproxy/templates/reversepassproxy.kojipkgs.conf
View file

@ -31,7 +31,7 @@ ProxyPreserveHost On
{% endif %} {% endif %}
{% if 'phx2' in inventory_hostname %} {% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %}
{% if balancer_name is defined %} {% if balancer_name is defined %}
<Proxy "balancer://{{balancer_name}}"> <Proxy "balancer://{{balancer_name}}">

2
roles/httpd/reverseproxy/templates/reversepassproxy.nagios.conf
View file

@ -1,4 +1,4 @@
{% if 'phx2' in inventory_hostname %} {% if 'phx2' in inventory_hostname or if 'iad2' in inventory_hostname %}
ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}} ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
{% else %} {% else %}