X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbase%2Fmanifests%2Finit.pp;h=867584a5885a549ab27882e3d87b7fe8e13111b3;hb=d824f9b2ae6fe566ad3c47c9d4f0c6aaa1057242;hp=6c382d2788f21adbbd66fa09a7919332e99cff7e;hpb=377c906331f9a6d0e7076396204b838b48a07677;p=mirror%2Fdsa-puppet.git

diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 6c382d278..867584a58 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,28 +1,6 @@
-class base {
-    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 dsa_lvm
-    include grub
-    include multipath
-    include popcon
-    include portforwarder
-    include postgres
-    include haveged
-    include huge_mem
-    include tcp_bbr
-    include certregen::client
+class base(
+  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 ].filter |$addr| { $addr != undef }
 }