sunet-cdn/cdn-ops
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

puppet-lint fixes

Browse source
This commit is contained in:
Patrik Lundin 2024-10-11 11:46:06 +02:00
parent ca9f7fbe50
commit 31d7a3c93a
Signed by: patlu
GPG key ID: A0A812BA2249F294
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
global/overlay/etc/puppet/modules/cdn/manifests/cache.pp
View file

@ -42,42 +42,42 @@ class cdn::cache(
if $cache_secrets { if $cache_secrets {
$customers.each |String $customer, Integer $customer_uid| { $customers.each |String $customer, Integer $customer_uid| {
if $cache_secrets['customers'][$customer] { if $cache_secrets['customers'][$customer] {
file { "/opt/sunet-cdn/customers/$customer": file { "/opt/sunet-cdn/customers/${customer}":
ensure => directory, ensure => directory,
owner => $customer_uid, owner => $customer_uid,
group => $customer_uid, group => $customer_uid,
mode => '0750', mode => '0750',
} }
file { "/opt/sunet-cdn/customers/$customer/conf": file { "/opt/sunet-cdn/customers/${customer}/conf":
ensure => directory, ensure => directory,
owner => $customer_uid, owner => $customer_uid,
group => $customer_uid, group => $customer_uid,
mode => '0750', mode => '0750',
} }
file { "/opt/sunet-cdn/customers/$customer/shared": file { "/opt/sunet-cdn/customers/${customer}/shared":
ensure => directory, ensure => directory,
owner => $customer_uid, owner => $customer_uid,
group => $customer_uid, group => $customer_uid,
mode => '0750', mode => '0750',
} }
file { "/opt/sunet-cdn/customers/$customer/cache": file { "/opt/sunet-cdn/customers/${customer}/cache":
ensure => directory, ensure => directory,
owner => $customer_uid, owner => $customer_uid,
group => $customer_uid, group => $customer_uid,
mode => '0750', mode => '0750',
} }
file { "/opt/sunet-cdn/customers/$customer/certs-private": file { "/opt/sunet-cdn/customers/${customer}/certs-private":
ensure => directory, ensure => directory,
owner => $customer_uid, owner => $customer_uid,
group => $customer_uid, group => $customer_uid,
mode => '0750', mode => '0750',
} }
$combined_pem = "/opt/sunet-cdn/customers/$customer/certs-private/combined.pem" $combined_pem = "/opt/sunet-cdn/customers/${customer}/certs-private/combined.pem"
concat { $combined_pem: concat { $combined_pem:
ensure => present, ensure => present,
@ -87,18 +87,18 @@ class cdn::cache(
} }
concat::fragment { "${customer}.fullchain-${$cache_secrets['customers'][$customer]['host']}": concat::fragment { "${customer}.fullchain-${$cache_secrets['customers'][$customer]['host']}":
target => $combined_pem, target => $combined_pem,
source => "/etc/letsencrypt/live/$cache_secrets['customers'][$customer]['host']/fullchain.pem", source => "/etc/letsencrypt/live/${cache_secrets['customers'][${customer}]['host']}/fullchain.pem",
order => '01' order => '01'
} }
concat::fragment { "${customer}-privkey-${$cache_secrets['customers'][$customer]['host']}": concat::fragment { "${customer}-privkey-${$cache_secrets['customers'][$customer]['host']}":
target => $combined_pem, target => $combined_pem,
source => "/etc/letsencrypt/live/$cache_secrets['customers'][$customer]['host']/privkey.pem", source => "/etc/letsencrypt/live/${cache_secrets['customers'][${customer}]['host']}/privkey.pem",
order => '02' order => '02'
} }
file { "/opt/sunet-cdn/customers/$customer/conf/haproxy.cfg": file { "/opt/sunet-cdn/customers/${customer}/conf/haproxy.cfg":
ensure => file, ensure => file,
owner => $customer_uid, owner => $customer_uid,
group => $customer_uid, group => $customer_uid,
@ -106,7 +106,7 @@ class cdn::cache(
content => template('cdn/cache/haproxy.cfg.erb'), content => template('cdn/cache/haproxy.cfg.erb'),
} }
file { "/opt/sunet-cdn/customers/$customer/conf/varnish.vcl": file { "/opt/sunet-cdn/customers/${customer}/conf/varnish.vcl":
ensure => file, ensure => file,
owner => $customer_uid, owner => $customer_uid,
group => $customer_uid, group => $customer_uid,
@ -114,12 +114,12 @@ class cdn::cache(
content => template('cdn/cache/varnish.vcl.erb'), content => template('cdn/cache/varnish.vcl.erb'),
} }
sunet::docker_compose { "sunet-cdn-cache-$customer": sunet::docker_compose { "sunet-cdn-cache-${customer}":
content => template('cdn/cache/docker-compose.yml.erb'), content => template('cdn/cache/docker-compose.yml.erb'),
service_name => "cdn-cache-$customer", service_name => "cdn-cache-${customer}",
compose_dir => "/opt/sunet-cdn/compose/$customer", compose_dir => "/opt/sunet-cdn/compose/${customer}",
compose_filename => 'docker-compose.yml', compose_filename => 'docker-compose.yml',
description => "SUNET CDN CA $customer", description => "SUNET CDN CA ${customer}",
} }
} }
} }