Update to varnish with fixes to Vary handling

global/overlay/etc/puppet/modules/cdn/manifests/cache.pp

@@ -3,7 +3,7 @@ class cdn::cache(
   Hash[String, Integer] $customers = {
     customer1 => 1000000000,
   },
-  String $sunet_cdnp_version = '0.0.7',
+  String $sunet_cdn_purger_version = '0.0.8',
   Hash[String, String] $acme_url = {
     test => 'https://internal-sto3-test-ca-1.cdn.sunet.se:9000/acme/acme/directory'
   },
@@ -155,51 +155,51 @@ class cdn::cache(
     creates => "/etc/letsencrypt/live/${my_fqdn}/fullchain.pem"
   }
 
-  $sunet_cdnp_dir = '/var/lib/sunet-cdnp'
+  $sunet_cdn_purger_dir = '/var/lib/sunet-cdn-purger'
-  $sunet_cdnp_file = "sunet-cdnp_${sunet_cdnp_version}_linux_${facts[os][architecture]}.tar.gz"
+  $sunet_cdn_purger_file = "sunet-cdn-purger_${sunet_cdn_purger_version}_linux_${facts[os][architecture]}.tar.gz"
-  $sunet_cdnp_url = "https://github.com/SUNET/sunet-cdnp/releases/download/v${sunet_cdnp_version}/${sunet_cdnp_file}"
+  $sunet_cdn_purger_url = "https://github.com/SUNET/sunet-cdn-purger/releases/download/v${sunet_cdn_purger_version}/${sunet_cdn_purger_file}"
   # Create directory for managing CDP purger
-  file { $sunet_cdnp_dir:
+  file { $sunet_cdn_purger_dir:
     ensure => directory,
     owner  => 'root',
     group  => 'root',
     mode   => '0755',
   }
 
-  exec { "curl -LO ${sunet_cdnp_url}":
+  exec { "curl -LO ${sunet_cdn_purger_url}":
-    creates => "${sunet_cdnp_dir}/${sunet_cdnp_file}",
+    creates => "${sunet_cdn_purger_dir}/${sunet_cdn_purger_file}",
-    cwd     => $sunet_cdnp_dir,
+    cwd     => $sunet_cdn_purger_dir,
-    notify  => Exec['extract sunet-cdnp'],
+    notify  => Exec['extract sunet-cdn-purger'],
   }
 
-  exec { 'extract sunet-cdnp':
+  exec { 'extract sunet-cdn-purger':
-    command     => "tar -xzf ${sunet_cdnp_file} sunet-cdnp",
+    command     => "tar -xzf ${sunet_cdn_purger_file} sunet-cdn-purger",
-    cwd         => $sunet_cdnp_dir,
+    cwd         => $sunet_cdn_purger_dir,
     refreshonly => true,
-    notify      => Service['sunet-cdnp'],
+    notify      => Service['sunet-cdn-purger'],
   }
 
-  file { "${sunet_cdnp_dir}/sunet-cdnp":
+  file { "${sunet_cdn_purger_dir}/sunet-cdn-purger":
     owner => 'root',
     group => 'root',
     mode  => '0755',
   }
 
-  file { '/usr/local/bin/sunet-cdnp':
+  file { '/usr/local/bin/sunet-cdn-purger':
     ensure => link,
-    target => "${sunet_cdnp_dir}/sunet-cdnp",
+    target => "${sunet_cdn_purger_dir}/sunet-cdn-purger",
   }
 
-  file { '/etc/systemd/system/sunet-cdnp.service':
+  file { '/etc/systemd/system/sunet-cdn-purger.service':
     ensure  => file,
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    content => template('cdn/cache/sunet-cdnp.service.erb'),
+    content => template('cdn/cache/sunet-cdn-purger.service.erb'),
     notify  => [Class['sunet::systemd_reload']],
   }
 
-  service { 'sunet-cdnp':
+  service { 'sunet-cdn-purger':
     ensure => 'running',
     enable => true,
   }

global/overlay/etc/puppet/modules/cdn/templates/cache/docker-compose.yml.erb

@@ -40,7 +40,7 @@ services:
     # We build our own varnish with the slash vmod present. We use the slash
     # "fellow" storage backend to be able to persist cached content to disk, so
     # it is retained in case of a restart of the container or machine.
-    image: "platform.sunet.se/sunet-cdn/cdn-varnish:af7f7d11e61acf9f6113811615d1baa46daf3bd1"
+    image: "platform.sunet.se/sunet-cdn/cdn-varnish@sha256:248b1ca861f1a8bb548845b656526210ef7015ba71c0e264dc4619da16407b40"
     # Use the same custom user as is used for haproxy.
     user: <%= @customer_uid %>:<%= @customer_uid %>
     volumes:

global/overlay/etc/puppet/modules/cdn/templates/cache/sunet-cdn-purger.service.erb

@@ -6,7 +6,7 @@ After=docker.service
 
 [Service]
 Type=simple
-ExecStart=/usr/local/bin/sunet-cdnp \
+ExecStart=/usr/local/bin/sunet-cdn-purger \
   -mqtt-ca-file /usr/local/share/ca-certificates/step_ca_root.crt \
   -mqtt-client-key-file /etc/letsencrypt/live/<%= @networking['fqdn'] %>/privkey.pem \
   -mqtt-client-cert-file /etc/letsencrypt/live/<%= @networking['fqdn'] %>/fullchain.pem \