diff options
| author | Stephen Smoogen <smooge@redhat.com> | 2015-03-30 20:40:48 +0000 |
|---|---|---|
| committer | Stephen Smoogen <smooge@redhat.com> | 2015-03-30 20:40:48 +0000 |
| commit | 7cba4be63ca4a3635c81cbe2bd27cd325efb8348 (patch) | |
| tree | d7221dc52ac5e15dcbe0ad5754f71ba70f657dbd | |
| parent | 3569deccb87f1c45ad31c42e96d0391c4d83dd88 (diff) | |
| download | ansible-7cba4be63ca4a3635c81cbe2bd27cd325efb8348.tar.gz ansible-7cba4be63ca4a3635c81cbe2bd27cd325efb8348.tar.xz ansible-7cba4be63ca4a3635c81cbe2bd27cd325efb8348.zip | |
and we have ipv6
| -rw-r--r-- | playbooks/include/proxies-websites.yml | 4 | ||||
| -rw-r--r-- | roles/httpd/proxy/templates/00-namevirtualhost.conf | 4 | ||||
| -rw-r--r-- | roles/mediawiki/templates/LocalSettings.php.fp.j2 | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 81edcc94e..96a232fa6 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -25,6 +25,7 @@ - "152.19.134.142" # proxy04 - "[2610:28:3090:3001:dead:beef:cafe:fed3]" # proxy04 - "5.175.150.50" # proxy05 + - "2a00:d1a0:1::131" # proxy05 - "140.211.169.196" # proxy06 - "213.175.193.206" # proxy07 - "67.203.2.67" # proxy08 @@ -32,6 +33,7 @@ - "192.168.122.2" # proxy09 - "10.5.126.51" # proxy10 - "67.219.144.68" # proxy11 + - "2604:1580:fe00:0:5054:ff:feae:702c" # proxy11 - wildcard_fpo_ips: # Staging @@ -45,6 +47,7 @@ - "152.19.134.142" # proxy04 - "[2610:28:3090:3001:dead:beef:cafe:fed3]" # proxy04 - "5.175.150.50" # proxy05 + - "2a00:d1a0:1::131" # proxy05 - "140.211.169.196" # proxy06 - "213.175.193.206" # proxy07 - "67.203.2.67" # proxy08 @@ -52,6 +55,7 @@ - "192.168.122.2" # proxy09 - "10.5.126.51" # proxy10 - "67.219.144.68" # proxy11 + - "2604:1580:fe00:0:5054:ff:feae:702c" # proxy11 pre_tasks: diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index 15a9599ad..8dc330f52 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -25,6 +25,8 @@ NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:443 # proxy05 NameVirtualHost 5.175.150.50:80 NameVirtualHost 5.175.150.50:443 +NameVirtualHost [2a00:d1a0:1::131]:80 +NameVirtualHost [2a00:d1a0:1::131]:443 #proxy06 NameVirtualHost 140.211.169.196:80 @@ -52,6 +54,8 @@ NameVirtualHost 10.5.126.51:443 # proxy11 NameVirtualHost 67.219.144.68:80 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 NameVirtualHost 10.5.126.88:80 diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 5c12a44fb..cbdbbfb07 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -350,6 +350,7 @@ $wgSquidServersNoPurge = array( # proxy05 "5.175.150.50", + "2a00:d1a0:1::131", "192.168.1.25", # proxy06 @@ -375,6 +376,7 @@ $wgSquidServersNoPurge = array( # proxy11 "67.219.144.68", + "2604:1580:fe00:0:5054:ff:feae:702c", "192.168.1.37", {% endif %} @@ -393,6 +395,8 @@ $wgSquidServers = array( "192.168.1.7:6081", # proxy04 "192.168.1.14:6081", + # proxy05 + "192.168.1.25:6081", # proxy06 "192.168.1.63:6081", # proxy07 @@ -403,6 +407,8 @@ $wgSquidServers = array( "192.168.1.15:6081", # proxy10 "10.5.126.51:6081", + # proxy11 + "192.168.1.37:6081", {% endif %} ); $wgSquidMaxage = 432000; |