BBlack has submitted this change and it was merged.

Change subject: varnish: remove libgeoip from text VCL compilation
......................................................................


varnish: remove libgeoip from text VCL compilation

Final step after transition to maxminddb VCL

Bug: T99226
Change-Id: I9ca4eabd602ecba8e1d90ece8eff1c249144addb
---
M modules/varnish/templates/initscripts/varnish.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb 
b/modules/varnish/templates/initscripts/varnish.systemd.erb
index 770c1d5..dc40f64 100644
--- a/modules/varnish/templates/initscripts/varnish.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnish.systemd.erb
@@ -9,7 +9,7 @@
 Restart=on-failure
 KillMode=process
 <% if @vcl_config.fetch("enable_geoiplookup", false) -%>
-Environment="CC_COMMAND=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %%o 
%%s -lmaxminddb -lGeoIP"
+Environment="CC_COMMAND=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %%o 
%%s -lmaxminddb"
 <% end -%>
 <% if @jemalloc_conf -%>
 Environment="MALLOC_CONF=<%= @jemalloc_conf %>"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ca4eabd602ecba8e1d90ece8eff1c249144addb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to