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=fc4cc0c1bb69621e1f7f81b9a737bd76522e88dd;hb=8af635702921a5ae19a067043421a9b4fa8c3f58;hp=ff0f8f1b186c1ea0ba2a885d1d66be87f37d8156;hpb=8e73118c48c6ce00092efbb09bfde05c355933fe;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 ff0f8f1b1..fc4cc0c1b 100644
--- a/modules/postgres/manifests/backup_server/register_backup_clienthost.pp
+++ b/modules/postgres/manifests/backup_server/register_backup_clienthost.pp
@@ -7,9 +7,9 @@
 #
 # @param allow_read_basedir  directory under which files can be read
 # @param allow_read_hosts    subdirectories under base to allow
-define postgres::backup_server::register_backup_clienthost (
+class postgres::backup_server::register_backup_clienthost (
   String $allow_read_basedir = '/srv/backups/pg',
-  Array[Stdlib::Fqdn] $allow_read_hosts = lookup( { 'name' => 'postgres::backup_server::register_backup_clienthost::allow_read_hosts', 'default_value' => [] } ),
+  Array[Stdlib::Fqdn] $allow_read_hosts = [],
 ) {
   include postgres::backup_server::globals
 
@@ -23,8 +23,4 @@ define postgres::backup_server::register_backup_clienthost (
     from        => $base::public_addresses,
     collect_tag => $postgres::backup_server::globals::tag_source_sshkey,
   }
-
-  # this rule is only needed for clusters that we do not manage
-  # with postgres::cluster.  Hopefully these will go away with time
-  Ferm::Rule::Simple <<| tag == 'postgres::backup_server::to-client' |>>
 }