BBlack has submitted this change and it was merged.
Change subject: varnish systemd unit file: iterate on fixups
......................................................................
varnish systemd unit file: iterate on fixups
Change-Id: I94f13d91a008fc3c2f490f17ccefe42032ab2373
---
M modules/varnish/templates/varnish.service.erb
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/templates/varnish.service.erb
b/modules/varnish/templates/varnish.service.erb
index 452e851..14b7a54 100644
--- a/modules/varnish/templates/varnish.service.erb
+++ b/modules/varnish/templates/varnish.service.erb
@@ -5,14 +5,15 @@
Type=forking
LimitNOFILE=500000
LimitMEMLOCK=90000
-PidFile=%t/%p.pid
+PIDFile=/run/varnishd<%= @instance_suffix -%>.pid
+Restart=on-failure
ExecReload=/usr/share/varnish/reload-vcl <%= @extraopts %> -q
ExecStart=/usr/sbin/varnishd \
--P %t/%p.pid \
+-P /run/varnishd<%= @instance_suffix -%>.pid \
-a :<%= @varnish_port -%> \
-T 127.0.0.1:<%= @varnish_admin_port -%> \
-f /etc/varnish/wikimedia_<%= @vcl -%>.vcl \
--w <%= 250 -%>,<%= @processorcount.to_i * 250 -%>,120 \
+-w 250,<%= @processorcount.to_i * 250 -%>,120 \
-S /etc/varnish/secret \
<%= @varnish_storage -%> \
-p user=varnish -p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
@@ -20,7 +21,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=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %o %s -lGeoIP'<%
end %>
[Install]
WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/186098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94f13d91a008fc3c2f490f17ccefe42032ab2373
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
