From 2f51dadae29d5fac31b451fa34fa482ca7f4dfd7 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 24 Sep 2019 08:46:46 +0200 Subject: [PATCH] spacing --- modules/bacula/manifests/node.pp | 51 ++++++++++++++++---------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/modules/bacula/manifests/node.pp b/modules/bacula/manifests/node.pp index 0bc4561b1..6a704b24c 100644 --- a/modules/bacula/manifests/node.pp +++ b/modules/bacula/manifests/node.pp @@ -1,35 +1,34 @@ # a bacula node. This is stored config by a client, collected on the director define bacula::node($bacula_client_port = $bacula::bacula_client_port) { + include bacula - include bacula + $bacula_pool_name = $bacula::bacula_pool_name + $bacula_filestor_name = $bacula::bacula_filestor_name + $bacula_filestor_device = $bacula::bacula_filestor_device + $bacula_storage_address = $bacula::bacula_storage_address + $bacula_storage_port = $bacula::bacula_storage_port + $bacula_storage_secret = $bacula::bacula_storage_secret - $bacula_pool_name = $bacula::bacula_pool_name - $bacula_filestor_name = $bacula::bacula_filestor_name - $bacula_filestor_device = $bacula::bacula_filestor_device - $bacula_storage_address = $bacula::bacula_storage_address - $bacula_storage_port = $bacula::bacula_storage_port - $bacula_storage_secret = $bacula::bacula_storage_secret + $bacula_ca_path = $bacula::bacula_ca_path + $bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert + $bacula_ssl_client_key = $bacula::bacula_ssl_client_key - $bacula_ca_path = $bacula::bacula_ca_path - $bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert - $bacula_ssl_client_key = $bacula::bacula_ssl_client_key + $bacula_client_name = "${name}-fd" + $bacula_client_secret = hkdf('/etc/puppet/secret', "bacula-fd-${name}") + $client = $name - $bacula_client_name = "${name}-fd" - $bacula_client_secret = hkdf('/etc/puppet/secret', "bacula-fd-${name}") - $client = $name + file { "/etc/bacula/conf.d/${name}.conf": + content => template('bacula/per-client.conf.erb'), + mode => '0440', + group => bacula, + notify => Exec['bacula-director reload'] + } - file { "/etc/bacula/conf.d/${name}.conf": - content => template('bacula/per-client.conf.erb'), - mode => '0440', - group => bacula, - notify => Exec['bacula-director reload'] - } - - file { "/etc/bacula/storages-list.d/${name}.storage": - content => "$bacula::bacula_filestor_name-$client\n", - mode => '0440', - group => bacula, - notify => Exec['bacula-director reload'] - } + file { "/etc/bacula/storages-list.d/${name}.storage": + content => "$bacula::bacula_filestor_name-$client\n", + mode => '0440', + group => bacula, + notify => Exec['bacula-director reload'] + } } -- 2.20.1