infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Add proxy02. Drop second ip.

Browse source
This commit is contained in:
Kevin Fenzi 2015-02-21 22:28:28 +00:00
parent 9a95681073
commit 1e7e1ec92c
17 changed files with 54 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

25
inventory/host_vars/proxy02.fedoraproject.org Normal file
View file

@ -0,0 +1,25 @@
---
nm: 255.255.255.240
gw: 85.236.55.1
dns: 62.116.130.3
ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7
ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/
vmhost: internetx01.fedoraproject.org
volgroup: /dev/VolGuests00
eth0_ip: 85.236.55.6
# This is consumed by the roles/fedora-web/main role
sponsor: internetx
datacenter: internetx
postfix_group: vpn
nrpe_procs_warn: 900
nrpe_procs_crit: 1000
# This is used in the httpd.conf to determine the value for serverlimit and
# maxrequestworkers. On 8gb proxies, 900 seems fine. But on 4gb proxies, this
# should be lowered in the host vars for that proxy.
maxrequestworkers: 400

6
playbooks/groups/proxies.yml
View file

@ -1,7 +1,7 @@
# create a new proxy server
- name: make new proxy server
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: False
@ -17,7 +17,7 @@
- include: "{{ handlers }}/restart_services.yml"
- name: make the box be real
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True
@ -73,7 +73,7 @@
- name: Set up the proxy basics
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: False

2
playbooks/include/proxies-certificates.yml
View file

@ -1,5 +1,5 @@
- name: Set up those proxy certificates. Good gravy..
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True

2
playbooks/include/proxies-fedora-web.yml
View file

@ -1,5 +1,5 @@
- name: Set up all that fedora-web goodness. What a wonder!
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True

2
playbooks/include/proxies-haproxy.yml
View file

@ -1,5 +1,5 @@
- name: Set up all the haproxy stuff.
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True

2
playbooks/include/proxies-miscellaneous.yml
View file

@ -1,5 +1,5 @@
- name: Set up all the other proxy stuff -- miscellaneous
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True

2
playbooks/include/proxies-redirects.yml
View file

@ -1,5 +1,5 @@
- name: Set up those proxy redirects. Wow!
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True

2
playbooks/include/proxies-reverseproxy.yml
View file

@ -1,5 +1,5 @@
- name: Set up those ProxyPassReverse statements. Somebody get me a cup of coffee..
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True

2
playbooks/include/proxies-rewrites.yml
View file

@ -1,5 +1,5 @@
- name: Set up some domain rewrites.
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True

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

@ -1,5 +1,5 @@
- name: Set up those proxy websites. My, my..
hosts: proxies-stg:proxies:!proxy02.fedoraproject.org
hosts: proxies-stg:proxies
user: root
gather_facts: True
@ -17,7 +17,6 @@
- "10.5.126.88"
# Production
- "85.236.55.5"
- "[2001:4178:2:1269::fed1]"
- "66.35.62.162"
- "80.239.156.214"

4
roles/httpd/proxy/templates/00-namevirtualhost.conf
View file

@ -7,12 +7,8 @@ NameVirtualHost 10.5.126.52:80
NameVirtualHost 10.5.126.52:443
# proxy02
NameVirtualHost 85.236.55.5:80
NameVirtualHost 85.236.55.5:443
NameVirtualHost 85.236.55.6:80
NameVirtualHost 85.236.55.6:443
NameVirtualHost [2001:4178:2:1269::fed1]:80
NameVirtualHost [2001:4178:2:1269::fed1]:443
NameVirtualHost [2001:4178:2:1269::fed2]:80
NameVirtualHost [2001:4178:2:1269::fed2]:443

4
roles/mediawiki/templates/LocalSettings.php.fp.j2
View file

@ -334,8 +334,8 @@ $wgSquidServers = array(
"192.168.1.11",
# proxy02
"85.236.55.5",
"2001:4178:2:1269::fed1",
"85.236.55.6",
"2001:4178:2:1269::fed2",
"192.168.1.12",
# proxy03

4
roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg
View file

@ -106,7 +106,7 @@ define host {
host_name proxy02.fedoraproject.org
alias proxy02.fedoraproject.org
use defaulttemplate
address 85.236.55.5
address 85.236.55.6
parents internetx01.fedoraproject.org
}
@ -133,7 +133,7 @@ define host {
host_name proxy02-ipv6-internetx.fedoraproject.org
alias proxy02-ipv6-internetx.fedoraproject.org
use defaulttemplate
address 2001:4178:2:1269::fed1
address 2001:4178:2:1269::fed2
parents internetx01-ipv6.fedoraproject.org
}

14
roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg
View file

@ -1,10 +1,10 @@
define host {
host_name 85.236.55.5-internetx
alias 85.236.55.5-internetx
use defaulttemplate
address 85.236.55.5
parents proxy02.fedoraproject.org
}
#define host {
# host_name 85.236.55.5-internetx
# alias 85.236.55.5-internetx
# use defaulttemplate
# address 85.236.55.5
# parents proxy02.fedoraproject.org
#}
define host {
host_name fpo-ipv6-internetx

4
roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg
View file

@ -72,9 +72,9 @@ define servicedependency {
}
define servicedependency {
host_name 85.236.55.5-internetx
host_name 85.236.55.6-internetx
service_description http
dependent_host_name 85.236.55.5-internetx
dependent_host_name 85.236.55.6-internetx
dependent_service_description fedoraproject.org, fedoraproject.org - wiki, start.fedoraproject.org
notification_failure_criteria w,c
execution_failure_criteria w,c

8
roles/nagios_server/files/nagios-external/services/websites.cfg
View file

@ -106,7 +106,7 @@ define service {
#
define service {
host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
service_description http
max_check_attempts 2
normal_check_interval 2
@ -115,14 +115,14 @@ define service {
}
define service {
host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
service_description fedoraproject.org
check_command check_website!fedoraproject.org!/!getfedora.org
use websitetemplate
}
define service {
host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
service_description fedoraproject.org - wiki
check_command check_website!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software
use websitetemplate
@ -150,7 +150,7 @@ define service {
}
define service {
host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.187-serverbeach
service_description start.fedoraproject.org
check_command check_website!start.fedoraproject.org!/!The Fedora Project is maintained
use websitetemplate

2
roles/nagios_server/files/nagios/hosts/proxy02-fpo.cfg
View file

@ -2,6 +2,6 @@ define host {
host_name proxy02-fpo
alias proxy02-fpo.fedoraproject.org
use defaulttemplate
address 85.236.55.5
address 85.236.55.6
parents proxy02
}