X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbase%2Fmanifests%2Finit.pp;h=867584a5885a549ab27882e3d87b7fe8e13111b3;hb=825e27050780ecccd54fb81d9d8f0ce7a3395caf;hp=413c6678526e38d9a69bc15334c492d0fe710df2;hpb=0138dbc335a697fae4cd7ac765776857582cef41;p=mirror%2Fdsa-puppet.git

diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 413c66785..867584a58 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,32 +1,6 @@
 class base(
-  Stdlib::IP::Address $public_address            = filter_ipv4(getfromhash($site::nodeinfo, 'ldap', 'ipHostNumber'))[0],
-  Optional[Stdlib::IP::Address] $public_address6 = filter_ipv6(getfromhash($site::nodeinfo, 'ldap', 'ipHostNumber'))[0],
+  Stdlib::IP::Address $public_address            = filter_ipv4(getfromhash($deprecated::nodeinfo, 'ldap', 'ipHostNumber'))[0],
+  Optional[Stdlib::IP::Address] $public_address6 = filter_ipv6(getfromhash($deprecated::nodeinfo, 'ldap', 'ipHostNumber'))[0],
 ) {
-  $public_addresses = [ $public_address, $public_address6 ]
-
-    include munin
-    include syslog_ng
-    include sudo
-    include ssh
-    include debian_org
-    include monit
-    include time
-    include ssl
-    include hardware
-    include nagios::client
-    include resolv
-    include roles
-    include motd
-    include unbound
-    include bacula::client
-    include autofs
-    include grub
-    include multipath
-    include popcon
-    include portforwarder
-    include postgres
-    include haveged
-    include huge_mem
-    include tcp_bbr
-    include certregen::client
+  $public_addresses = [ $public_address, $public_address6 ].filter |$addr| { $addr != undef }
 }