From 6309136b6a131d14e0cc69d1913a09f6e4e8d690 Mon Sep 17 00:00:00 2001 From: Stuart Shields Date: Sun, 17 Nov 2024 13:36:18 +1000 Subject: [PATCH] Update for noble numbat --- modules/chassis_openssl/manifests/init.pp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/chassis_openssl/manifests/init.pp b/modules/chassis_openssl/manifests/init.pp index c99be6f..fb9b578 100644 --- a/modules/chassis_openssl/manifests/init.pp +++ b/modules/chassis_openssl/manifests/init.pp @@ -2,23 +2,23 @@ class chassis_openssl ( $config, ) { - if ( ! defined( File["/etc/nginx/sites-available/${::fqdn}.d"] ) ) { - file { "/etc/nginx/sites-available/${::fqdn}.d": + if ( ! defined( File["/etc/nginx/sites-available/${facts['networking']['fqdn']}.d"] ) ) { + file { "/etc/nginx/sites-available/${facts['networking']['fqdn']}.d": ensure => directory, require => Package['nginx'] } } - file { "/etc/nginx/sites-available/${::fqdn}.d/ssl": + file { "/etc/nginx/sites-available/${facts['networking']['fqdn']}.d/ssl": content => template('chassis_openssl/site.nginx.conf.ssl.erb'), - require => File[ "/etc/nginx/sites-available/${::fqdn}.d" ], + require => File[ "/etc/nginx/sites-available/${facts['networking']['fqdn']}.d" ], notify => Service['nginx'], } - openssl::certificate::x509 { $::fqdn: + openssl::certificate::x509 { $facts['networking']['fqdn']: country => 'CH', organization => 'Example.com', - commonname => $::fqdn, + commonname => $facts['networking']['fqdn'], altnames => $::config[hosts], extkeyusage => [ 'serverAuth', 'clientAuth' ], cnf_tpl => 'chassis_openssl/cert.cnf.erb', @@ -26,16 +26,16 @@ owner => 'www-data', group => 'www-data', } - -> file { "/vagrant/${::fqdn}.cert": + -> file { "/vagrant/${facts['networking']['fqdn']}.cert": ensure => present, replace => $config['chassis_openssl']['cert']['replace'], - source => "/etc/ssl/certs/${::fqdn}.crt", + source => "/etc/ssl/certs/${facts['networking']['fqdn']}.crt", mode => '0644', } - -> file { "/vagrant/${::fqdn}.key": + -> file { "/vagrant/${facts['networking']['fqdn']}.key": ensure => present, replace => $config['chassis_openssl']['key']['replace'], - source => "/etc/ssl/certs/${::fqdn}.key", + source => "/etc/ssl/certs/${facts['networking']['fqdn']}.key", mode => '0644', } }