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

and we have ipv6

Browse source
This commit is contained in:
Stephen Smoogen 2015-03-30 20:40:48 +00:00
parent 3569deccb8
commit 7cba4be63c
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@
- "152.19.134.142" # proxy04 - "152.19.134.142" # proxy04
- "[2610:28:3090:3001:dead:beef:cafe:fed3]" # proxy04 - "[2610:28:3090:3001:dead:beef:cafe:fed3]" # proxy04
- "5.175.150.50" # proxy05 - "5.175.150.50" # proxy05
- "2a00:d1a0:1::131" # proxy05
- "140.211.169.196" # proxy06 - "140.211.169.196" # proxy06
- "213.175.193.206" # proxy07 - "213.175.193.206" # proxy07
- "67.203.2.67" # proxy08 - "67.203.2.67" # proxy08
@ -32,6 +33,7 @@
- "192.168.122.2" # proxy09 - "192.168.122.2" # proxy09
- "10.5.126.51" # proxy10 - "10.5.126.51" # proxy10
- "67.219.144.68" # proxy11 - "67.219.144.68" # proxy11
- "2604:1580:fe00:0:5054:ff:feae:702c" # proxy11
- wildcard_fpo_ips: - wildcard_fpo_ips:
# Staging # Staging
@ -45,6 +47,7 @@
- "152.19.134.142" # proxy04 - "152.19.134.142" # proxy04
- "[2610:28:3090:3001:dead:beef:cafe:fed3]" # proxy04 - "[2610:28:3090:3001:dead:beef:cafe:fed3]" # proxy04
- "5.175.150.50" # proxy05 - "5.175.150.50" # proxy05
- "2a00:d1a0:1::131" # proxy05
- "140.211.169.196" # proxy06 - "140.211.169.196" # proxy06
- "213.175.193.206" # proxy07 - "213.175.193.206" # proxy07
- "67.203.2.67" # proxy08 - "67.203.2.67" # proxy08
@ -52,6 +55,7 @@
- "192.168.122.2" # proxy09 - "192.168.122.2" # proxy09
- "10.5.126.51" # proxy10 - "10.5.126.51" # proxy10
- "67.219.144.68" # proxy11 - "67.219.144.68" # proxy11
- "2604:1580:fe00:0:5054:ff:feae:702c" # proxy11
pre_tasks: pre_tasks:

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

@ -25,6 +25,8 @@ NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:443
# proxy05 # proxy05
NameVirtualHost 5.175.150.50:80 NameVirtualHost 5.175.150.50:80
NameVirtualHost 5.175.150.50:443 NameVirtualHost 5.175.150.50:443
NameVirtualHost [2a00:d1a0:1::131]:80
NameVirtualHost [2a00:d1a0:1::131]:443
#proxy06 #proxy06
NameVirtualHost 140.211.169.196:80 NameVirtualHost 140.211.169.196:80
@ -52,6 +54,8 @@ NameVirtualHost 10.5.126.51:443
# proxy11 # proxy11
NameVirtualHost 67.219.144.68:80 NameVirtualHost 67.219.144.68:80
NameVirtualHost 67.219.144.68:443 NameVirtualHost 67.219.144.68:443
NameVirtualHost [2604:1580:fe00:0:5054:ff:feae:702c]:80
NameVirtualHost [2604:1580:fe00:0:5054:ff:feae:702c]:443
#proxy01.stg #proxy01.stg
NameVirtualHost 10.5.126.88:80 NameVirtualHost 10.5.126.88:80

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

@ -350,6 +350,7 @@ $wgSquidServersNoPurge = array(
# proxy05 # proxy05
"5.175.150.50", "5.175.150.50",
"2a00:d1a0:1::131",
"192.168.1.25", "192.168.1.25",
# proxy06 # proxy06
@ -375,6 +376,7 @@ $wgSquidServersNoPurge = array(
# proxy11 # proxy11
"67.219.144.68", "67.219.144.68",
"2604:1580:fe00:0:5054:ff:feae:702c",
"192.168.1.37", "192.168.1.37",
{% endif %} {% endif %}
@ -393,6 +395,8 @@ $wgSquidServers = array(
"192.168.1.7:6081", "192.168.1.7:6081",
# proxy04 # proxy04
"192.168.1.14:6081", "192.168.1.14:6081",
# proxy05
"192.168.1.25:6081",
# proxy06 # proxy06
"192.168.1.63:6081", "192.168.1.63:6081",
# proxy07 # proxy07
@ -403,6 +407,8 @@ $wgSquidServers = array(
"192.168.1.15:6081", "192.168.1.15:6081",
# proxy10 # proxy10
"10.5.126.51:6081", "10.5.126.51:6081",
# proxy11
"192.168.1.37:6081",
{% endif %} {% endif %}
); );
$wgSquidMaxage = 432000; $wgSquidMaxage = 432000;