Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115350

Change subject: text varnishes: set enable_geoiplookup to false
......................................................................

text varnishes: set enable_geoiplookup to false

Using geoip causes segfaults all over the place.

Change-Id: I6b4649b13246532edd557b3a645b2094cbe6e202
---
M manifests/role/cache.pp
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/115350/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 40ac762..2e438a2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -674,7 +674,7 @@
                     'weight' => $backend_weight,
                 }],
             cluster_options => {
-                'enable_geoiplookup' => true,
+                'enable_geoiplookup' => false,
             },
         }
 
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 1c2d37a..cf429ec 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -129,8 +129,10 @@
                && req.url !~ "(?i)bcache=1") {
                set resp.http.Cache-Control = "private, s-maxage=0, max-age=0, 
must-revalidate";
        }
+<% if cluster_options.fetch( "enable_geoiplookup", false ) -%>
        /* Perform GeoIP look-up and send the result as a session cookie */
        if (req.http.Cookie !~ "(^|;\s*)GeoIP=[^;]") {
                call geoip_cookie;
        }
+<% end -%>
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/115350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b4649b13246532edd557b3a645b2094cbe6e202
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to