Bug#856684: unblock: varnish/5.0.0-7
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package varnish
The varnish package includes a script to reload the VCL set in
/etc/default/varnish, which the systemd unit does not use. Running
"systemctl reload varnish" might not work at all, or load the wrong
configuration. This version fixes this problem by dropping the
"reload" action from the systemd unit.
diff -Nru varnish-5.0.0/debian/changelog varnish-5.0.0/debian/changelog
--- varnish-5.0.0/debian/changelog 2016-12-20 22:04:01.000000000 +0100
+++ varnish-5.0.0/debian/changelog 2017-03-02 18:16:05.000000000 +0100
@@ -1,3 +1,9 @@
+varnish (5.0.0-7) unstable; urgency=medium
+
+ * Remove reload from varnish.service (Closes: #749272)
+
+ -- Stig Sandbeck Mathisen <ssm@debian.org> Thu, 02 Mar 2017 18:16:05 +0100
+
varnish (5.0.0-6) unstable; urgency=medium
* Update reload-vcl for varnish 5.x
diff -Nru varnish-5.0.0/debian/tests/spec/varnish/use_spec.rb varnish-5.0.0/debian/tests/spec/varnish/use_spec.rb
--- varnish-5.0.0/debian/tests/spec/varnish/use_spec.rb 2016-12-20 22:04:01.000000000 +0100
+++ varnish-5.0.0/debian/tests/spec/varnish/use_spec.rb 2017-03-02 18:16:05.000000000 +0100
@@ -23,7 +23,7 @@
end
describe command('systemctl reload varnish') do
- its(:exit_status) { should eq 0 }
- its(:stderr) { should eq '' }
+ its(:exit_status) { should eq 3 }
+ its(:stderr) { is_expected.to include('Job type reload is not applicable for unit varnish.service.') }
its(:stdout) { should eq('') }
end
diff -Nru varnish-5.0.0/debian/varnish.service varnish-5.0.0/debian/varnish.service
--- varnish-5.0.0/debian/varnish.service 2016-12-20 22:04:01.000000000 +0100
+++ varnish-5.0.0/debian/varnish.service 2017-03-02 18:16:05.000000000 +0100
@@ -7,7 +7,6 @@
LimitNOFILE=131072
LimitMEMLOCK=82000
ExecStart=/usr/sbin/varnishd -j unix,user=vcache -F -a :6081 -T localhost:6082 -f /etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m
-ExecReload=/usr/share/varnish/reload-vcl
ProtectSystem=full
ProtectHome=true
PrivateTmp=true
unblock varnish/5.0.0-7
-- System Information:
Debian Release: 9.0
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'testing'), (500, 'stable'), (98, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: