diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
new file mode 100644
index 0000000..b3d78fe
--- /dev/null
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -0,0 +1,34 @@
+---
+nagios_ip_v6: 2001:948:4:6::111
+nagios_ip_v4: 109.105.111.111
+nrpe_clients:
+   - 127.0.0.1
+   - 127.0.1.1
+   - 109.105.111.111
+   - 2001:948:4:6::111
+   - 89.45.233.107
+
+syslog_servers:
+   - syslog.sunet.se:514
+
+mgmt_addresses:
+    - 109.105.113.42    # statler.nordu.net
+    - 2001:948:4:2::42  # statler.nordu.net
+    - 109.105.113.85    # waldorf.nordu.net
+    - 2001:948:4:3::85  # waldorf.nordu.net
+    - 130.242.125.68    # hoppjerka.sunet.se
+    - 2001:6b0:8:4::68  # hoppjerka.sunet.se
+    - 130.242.121.73    # joppherka.sunet.se
+    - 2001:6b0:7:6::73  # joppherka.sunet.se
+
+# Database of SSH keys. Presence of a key in this database does NOT mean it gets
+# installed anywhere. Real ACLs refer to keys in this database.
+sunet_ssh_keys:
+
+  'pettai+07431497':
+    name   : 'pettai+07431497@sunet.se'
+    key    : 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDnIQ2mZJT13YuBUOLM4Xlkp1165nlKvSC3oNE2Z47sKmcgwgKwPJssd1WsmkKDOsoxsvS6FJiAbmCQe/EdwT4dolRpVjczpp9p+w6wjtTXsWPsSUDbT0ZD8IOmOr24F8Z0WY/ho1Bmm3LwCMbW30KROpZn9VWyzGT6QTGwiZF/lyItsdGcYC2qgaXJpI0sEc5W1WK4ozpTu7z3BtzpyjOvVAQirF7Dp2yU3dLB93vj+/BYnB5F/1cmTWfu6lGRtO60E0j9DSH20AqTGfsJI4fPM7tbJnT2Fhj+MS8bHf6iEnh2QwlUSUdMlJAxXVu1XcLiSbbHXV4Mh7gCuGB0p0rMGiBg9W/t+D2dYsBQxuXq8fT4iqlaHaUwoVYtsDTMIg3c17mcYni5VRk2d49qpva6zR0zU3v0X2YtvHWlCCYBmjWSS/8X8FUgHVOaCEAOjTU89TvG9uvxXoqO64Wznx7sjywkaWuwmNck2K3xlhccw5iy+K1xxalKgcel6nMxdoBuW2RFRAYCCAT8IH+ONzLOcGj/+sRJx+bl18qYWcZGcYA9IbfJCNXuQHX4uRLjtml+zNac3Kefmw1jyBRUUkWbdcAsW3kvf3+CcP62URCk+eFMywnGk8N6UX9akSxgMKTR3IHuqZLHtzbgUxgeRHCLUid9GwsqDmu3fC8fLRK7sQ=='
+
+dns_ssh_keys:
+  'root':
+    - 'pettai+07431497'
diff --git a/global/overlay/etc/puppet/modules/dns/manifests/init.pp b/global/overlay/etc/puppet/modules/dns/manifests/init.pp
new file mode 100644
index 0000000..4d7b871
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/dns/manifests/init.pp
@@ -0,0 +1,25 @@
+# Base class for everything dns
+class dns {
+
+  Exec {
+    path => ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin', ],
+  }
+
+  sunet::ssh_keys {'dns':
+    config => safe_hiera('dns_ssh_keys', {})
+  }
+
+  # Keep journald logs for 90 days, (#or 500 MB)
+  sunet::scriptherder::cronjob { 'clean_logs':
+    cmd           => 'sh -c \'test -x /bin/journalctl && /bin/journalctl --vacuum-time=90d\'',
+    special       => 'daily',
+    ok_criteria   => ['exit_status=0', 'max_age=50h'],
+    warn_criteria => ['exit_status=0', 'max_age=72h'],
+  }
+  #file_line { 'journald_SystemMaxUse':
+  #  path  => '/etc/systemd/journald.conf',
+  #  after => '^#SystemMaxUse',
+  #  match => '^SystemMaxUse=',
+  #  line  => 'SystemMaxUse=500M',
+  #}
+}