summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorStephen Smoogen <smooge@redhat.com>2015-03-23 22:51:30 +0000
committerStephen Smoogen <smooge@redhat.com>2015-03-23 22:51:30 +0000
commit73d8098fc2356cea2a6f990ef33d4e6b28d59cd8 (patch)
treec58a40bb9c47bfdf740e87183df3eb7453e51cf7 /roles
parent838ec2ec4c180d1ffbd9ee725078e3f157ec775d (diff)
downloadansible-73d8098fc2356cea2a6f990ef33d4e6b28d59cd8.tar.gz
ansible-73d8098fc2356cea2a6f990ef33d4e6b28d59cd8.tar.xz
ansible-73d8098fc2356cea2a6f990ef33d4e6b28d59cd8.zip
oh yeah.. vpn
Diffstat (limited to 'roles')
-rw-r--r--roles/httpd/proxy/templates/00-namevirtualhost.conf8
-rw-r--r--roles/mediawiki/templates/LocalSettings.php.fp.j29
2 files changed, 17 insertions, 0 deletions
diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf
index 816ae9d8b..15a9599ad 100644
--- a/roles/httpd/proxy/templates/00-namevirtualhost.conf
+++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf
@@ -22,6 +22,10 @@ NameVirtualHost 152.19.134.142:443
NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:80
NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:443
+# proxy05
+NameVirtualHost 5.175.150.50:80
+NameVirtualHost 5.175.150.50:443
+
#proxy06
NameVirtualHost 140.211.169.196:80
NameVirtualHost 140.211.169.196:443
@@ -45,6 +49,10 @@ NameVirtualHost 192.168.122.2:443
NameVirtualHost 10.5.126.51:80
NameVirtualHost 10.5.126.51:443
+# proxy11
+NameVirtualHost 67.219.144.68:80
+NameVirtualHost 67.219.144.68:443
+
#proxy01.stg
NameVirtualHost 10.5.126.88:80
NameVirtualHost 10.5.126.88:443
diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index 675dd7e27..5c12a44fb 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -347,6 +347,10 @@ $wgSquidServersNoPurge = array(
"152.19.134.142",
"2610:28:3090:3001:dead:beef:cafe:fed3",
"192.168.1.14",
+
+ # proxy05
+ "5.175.150.50",
+ "192.168.1.25",
# proxy06
"140.211.169.196",
@@ -368,6 +372,11 @@ $wgSquidServersNoPurge = array(
# proxy10
"10.5.126.51",
"192.168.1.17",
+
+ # proxy11
+ "67.219.144.68",
+ "192.168.1.37",
+
{% endif %}
);
# This setting is used to send PURGE requests to varnish on reverse proxies upon page changes