BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186106
Change subject: varnish systemd unit file: iterate on fixups #3
......................................................................
varnish systemd unit file: iterate on fixups #3
Change-Id: I0126e8d99679b467021171d641da9b8fedc774b6
---
M modules/varnish/templates/varnish.service.erb
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/186106/1
diff --git a/modules/varnish/templates/varnish.service.erb
b/modules/varnish/templates/varnish.service.erb
index f7fcf8d..8c6abcf 100644
--- a/modules/varnish/templates/varnish.service.erb
+++ b/modules/varnish/templates/varnish.service.erb
@@ -5,11 +5,14 @@
Type=forking
LimitNOFILE=500000
LimitMEMLOCK=90000
-PIDFile=/run/varnishd<%= @instancesuffix -%>.pid
+PIDFile=%t/%p.pid
Restart=on-failure
+<% if @cluster_options.fetch("enable_geoiplookup", false) -%>
+Environment="CC_COMMAND=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %o
%s -lGeoIP"
+<% end -%>
ExecReload=/usr/share/varnish/reload-vcl <%= @extraopts %> -q
ExecStart=/usr/sbin/varnishd \
--P /run/varnishd<%= @instancesuffix -%>.pid \
+-P %t/%p.pid \
-a :<%= @varnish_port -%> \
-T 127.0.0.1:<%= @varnish_admin_port -%> \
-f /etc/varnish/wikimedia_<%= @vcl -%>.vcl \
@@ -21,7 +24,7 @@
-p nuke_limit=300 -p shm_reclen=1024 \
<%= @runtime_params -%> \
<%= @extraopts -%> \
-<% if @cluster_options.fetch("enable_geoiplookup", false) -%>-p
cc_command=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %o %s -lGeoIP<%
end %>
+<% if @cluster_options.fetch("enable_geoiplookup", false) -%>-p
cc_command=${CC_COMMAND}<% end %>
[Install]
WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/186106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0126e8d99679b467021171d641da9b8fedc774b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
