Rename sunet-cdnp -> sunet-cdn-purger

This commit is contained in:
Patrik Lundin 2025-04-23 17:14:14 +02:00
parent 5489eeeb7a
commit b4e3aa7815
Signed by: patlu
GPG key ID: A0A812BA2249F294
2 changed files with 20 additions and 20 deletions

View file

@ -3,7 +3,7 @@ class cdn::cache(
Hash[String, Integer] $customers = { Hash[String, Integer] $customers = {
customer1 => 1000000000, customer1 => 1000000000,
}, },
String $sunet_cdnp_version = '0.0.7', String $sunet_cdn_purger_version = '0.0.7',
Hash[String, String] $acme_url = { Hash[String, String] $acme_url = {
test => 'https://internal-sto3-test-ca-1.cdn.sunet.se:9000/acme/acme/directory' 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" 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 # Create directory for managing CDP purger
file { $sunet_cdnp_dir: file { $sunet_cdn_purger_dir:
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', 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, 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', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
} }
file { '/usr/local/bin/sunet-cdnp': file { '/usr/local/bin/sunet-cdn-purger':
ensure => link, 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, ensure => file,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => template('cdn/cache/sunet-cdnp.service.erb'), content => template('cdn/cache/sunet-cdn-purger.service.erb'),
notify => [Class['sunet::systemd_reload']], notify => [Class['sunet::systemd_reload']],
} }
service { 'sunet-cdnp': service { 'sunet-cdn-purger':
ensure => 'running', ensure => 'running',
enable => true, enable => true,
} }

View file

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