From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 21:19:34 +0000 (+0200)
Subject: Make a roles::dns_geodns
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=e34d8e0cd1246d068196493701922e4e1645b9e6;p=mirror%2Fdsa-puppet.git

Make a roles::dns_geodns
---

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 141cd4987..d9684f3db 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -65,6 +65,4 @@ class named::geodns inherits named {
 		description => 'Allow nameserver access',
 		rule        => '&TCP_UDP_SERVICE(53)'
 	}
-
-	ssh::keygen { 'geodnssync': }
 }
diff --git a/modules/roles/manifests/dns_geodns.pp b/modules/roles/manifests/dns_geodns.pp
new file mode 100644
index 000000000..48bb916c6
--- /dev/null
+++ b/modules/roles/manifests/dns_geodns.pp
@@ -0,0 +1,6 @@
+# the geodns noes
+class roles::dns_geodns {
+  include named::geodns
+
+  ssh::keygen { 'geodnssync': }
+}
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8c976f78e..da2855b0b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -157,7 +157,7 @@ class roles {
 	}
 
 	if has_role('dns_geo') {
-		include named::geodns
+		include roles::dns_geodns
 	}
 
 	if has_role('weblog_destination') {