--- Exec[retry-load-new-vcl-file-frontend].orig
+++ Exec[retry-load-new-vcl-file-frontend]
@@
- command => /usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a && (rm /var/tmp/reload-vcl-failed-frontend; true)
+ command => /usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a && (rm /var/tmp/reload-vcl-failed-frontend; true)
File[/etc/confd/conf.d/_etc_varnish_known-client-rate-limits.inc.vcl.toml]
- Content differences:
--- /etc/confd/conf.d/_etc_varnish_known-client-rate-limits.inc.vcl.toml.orig
+++ /etc/confd/conf.d/_etc_varnish_known-client-rate-limits.inc.vcl.toml
@@ -14,4 +14,4 @@
prefix = "/conftool/v1"
-reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a"
+reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a"
File[/etc/confd/conf.d/_etc_varnish_requestctl-filters-bots.inc.vcl.toml]
- Content differences:
--- /etc/confd/conf.d/_etc_varnish_requestctl-filters-bots.inc.vcl.toml.orig
+++ /etc/confd/conf.d/_etc_varnish_requestctl-filters-bots.inc.vcl.toml
@@ -14,4 +14,4 @@
prefix = "/conftool/v1"
-reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a"
+reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a"
File[/etc/confd/conf.d/_etc_varnish_directors.frontend.vcl.toml]
- Content differences:
--- /etc/confd/conf.d/_etc_varnish_directors.frontend.vcl.toml.orig
+++ /etc/confd/conf.d/_etc_varnish_directors.frontend.vcl.toml
@@ -14,4 +14,4 @@
-reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a"
+reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a"
File[/etc/confd/conf.d/_etc_varnish_requestctl-filters-deprecation.inc.vcl.toml]
- Content differences:
--- /etc/confd/conf.d/_etc_varnish_requestctl-filters-deprecation.inc.vcl.toml.orig
+++ /etc/confd/conf.d/_etc_varnish_requestctl-filters-deprecation.inc.vcl.toml
@@ -14,4 +14,4 @@
prefix = "/conftool/v1"
-reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a"
+reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a"
File[/etc/confd/conf.d/_etc_varnish_requestctl-filters-hit.inc.vcl.toml]
- Content differences:
--- /etc/confd/conf.d/_etc_varnish_requestctl-filters-hit.inc.vcl.toml.orig
+++ /etc/confd/conf.d/_etc_varnish_requestctl-filters-hit.inc.vcl.toml
@@ -14,4 +14,4 @@
prefix = "/conftool/v1"
-reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a"
+reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a"
File[/lib/systemd/system/varnish-frontend.service]
- Content differences:
--- /lib/systemd/system/varnish-frontend.service.orig
+++ /lib/systemd/system/varnish-frontend.service
@@ -25,13 +25,13 @@
Environment="MALLOC_CONF=thp:never"
# rsyslog will see this in $programname
SyslogIdentifier=varnish-frontend
-ExecReload=/usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a
+ExecReload=/usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a
# We start varnishd(1) without specifying a VCL file (-f ''). Use reload-vcl in
# ExecStartPost to load and label separate VCL files first, and the main one
# last. This is necessary given that the main VCL file might reference the
# label of separate VCLs, and would otherwise fail to compile if loaded
# directly with -f.
-ExecStartPost=/usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a --start-child
+ExecStartPost=/usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a --start-child
# thread_pools * thread_pool_max = maximum number of threads spawned.
ExecStart=/usr/sbin/varnishd \
-P %t/%p.pid \
Exec[load-new-vcl-file-frontend]
- Parameters differences:
--- Exec[load-new-vcl-file-frontend].orig
+++ Exec[load-new-vcl-file-frontend]
@@
- command => /usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a || (touch /var/tmp/reload-vcl-failed-frontend; false)
+ command => /usr/local/sbin/reload-vcl -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a || (touch /var/tmp/reload-vcl-failed-frontend; false)
- File[/etc/confd/conf.d/_etc_varnish_requestctl-filters-auth.inc.vcl.toml]
- Content differences:
--- /etc/confd/conf.d/_etc_varnish_requestctl-filters-auth.inc.vcl.toml.orig
+++ /etc/confd/conf.d/_etc_varnish_requestctl-filters-auth.inc.vcl.toml
@@ -14,4 +14,4 @@
prefix = "/conftool/v1"
-reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 2 -a"
+reload_cmd = "/usr/local/bin/confd-reload-vcl varnish-frontend -n frontend -f /etc/varnish/wikimedia_upload-frontend.vcl -d 5 -a"
Relevant files