X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server%2Fregister_backup_clienthost.pp;h=12391a51ef090645b2cbbeea52c503b3f6f2650c;hb=cc329163d6dc3ed60047c8b7c6f4b10e3499daaa;hp=00ef58288b67591560cd09ca1a6bf4bd92472f56;hpb=fa71f654c67691b4b4a276cf936eb76cab6d60f6;p=mirror%2Fdsa-puppet.git diff --git a/modules/postgres/manifests/backup_server/register_backup_clienthost.pp b/modules/postgres/manifests/backup_server/register_backup_clienthost.pp index 00ef58288..12391a51e 100644 --- a/modules/postgres/manifests/backup_server/register_backup_clienthost.pp +++ b/modules/postgres/manifests/backup_server/register_backup_clienthost.pp @@ -1,19 +1,19 @@ # define postgres::backup_server::register_backup_clienthost ( - $sshpubkey = $::postgresql_key, - $ipaddrlist = join(getfromhash($site::nodeinfo, 'ldap', 'ipHostNumber'), ","), - $hostname = $::hostname, + $sshpubkey = $::postgres_key, + $ipaddrlist = join(getfromhash($deprecated::nodeinfo, 'ldap', 'ipHostNumber'), ","), + $hostname = $::hostname, ) { - include postgres::backup_server::globals + include postgres::backup_server::globals - if $sshpubkey { - $addr = assert_type(String[1], $ipaddrlist) - @@concat::fragment { "postgresql::server::backup-source-clienthost::$name::$fqdn": - target => $postgres::backup_server::globals::sshkeys_sources , - content => @("EOF"), - ${hostname} ${addr} ${sshpubkey} - | EOF - tag => $postgres::backup_server::globals::tag_source_sshkey, - } - } + if $sshpubkey { + $addr = assert_type(String[1], $ipaddrlist) + @@concat::fragment { "postgresql::server::backup-source-clienthost::$name::$fqdn": + target => $postgres::backup_server::globals::sshkeys_sources , + content => @("EOF"), + ${hostname} ${addr} ${sshpubkey} + | EOF + tag => $postgres::backup_server::globals::tag_source_sshkey, + } + } }