From: alex <alex@pdp7.net>
Date: Sun, 15 Jan 2023 19:17:35 +0000 (+0100)
Subject: Do not keep everything in 00-common.pp
X-Git-Tag: 20240214-emacs~502
X-Git-Url: https://xn--ix-yja.es/gitweb/?a=commitdiff_plain;h=93c2ebba504ba843bcb0341d306d4cdc930bd61b;p=alex.git

Do not keep everything in 00-common.pp
---

diff --git a/personal_infra/puppet/site/00-common.pp b/personal_infra/puppet/site/00-common.pp
index b542eb9..080c754 100644
--- a/personal_infra/puppet/site/00-common.pp
+++ b/personal_infra/puppet/site/00-common.pp
@@ -1,28 +1 @@
 include automatic_updates
-
-$tinc_hosts = lookup("groups.tinc")
-$tinc_other_hosts = $tinc_hosts.filter |$host_name| { $host_name != $facts["networking"]["fqdn"] }
-
-$tinc_locations = Hash($tinc_hosts.map |$host_name| { [
-  lookup("hostvars.'$host_name'.network.tinc.location"),
-  {
-    subnet => lookup("hostvars.'$host_name'.network.self_internal_network"),
-    address => lookup("hostvars.'$host_name'.network.public_hostname"),
-  }
-] })
-
-$tinc_connect_to = $tinc_other_hosts.map |$host_name| { lookup("hostvars.'$host_name'.network.tinc.location") }
-
-$tinc_other_networks = $tinc_other_hosts.map |$host_name| { lookup("hostvars.'$host_name'.network.self_internal_network") }
-
-if 'tinc' in lookup("group_names") {
-  class {'tinc':
-    tinc_name           => lookup("tinc_global.name"),
-    tinc_location       => lookup("network.tinc.location"),
-    tinc_connect_to     => $tinc_connect_to,
-    tinc_locations      => $tinc_locations,
-    tinc_ip             => lookup("network.self_internal_ip"),
-    tinc_netmask        => lookup("network.self_internal_netmask"),
-    tinc_other_networks => $tinc_other_networks,
-  }
-}
diff --git a/personal_infra/puppet/site/01-tinc.pp b/personal_infra/puppet/site/01-tinc.pp
new file mode 100644
index 0000000..148e598
--- /dev/null
+++ b/personal_infra/puppet/site/01-tinc.pp
@@ -0,0 +1,26 @@
+$tinc_hosts = lookup("groups.tinc")
+$tinc_other_hosts = $tinc_hosts.filter |$host_name| { $host_name != $facts["networking"]["fqdn"] }
+
+$tinc_locations = Hash($tinc_hosts.map |$host_name| { [
+  lookup("hostvars.'$host_name'.network.tinc.location"),
+  {
+    subnet => lookup("hostvars.'$host_name'.network.self_internal_network"),
+    address => lookup("hostvars.'$host_name'.network.public_hostname"),
+  }
+] })
+
+$tinc_connect_to = $tinc_other_hosts.map |$host_name| { lookup("hostvars.'$host_name'.network.tinc.location") }
+
+$tinc_other_networks = $tinc_other_hosts.map |$host_name| { lookup("hostvars.'$host_name'.network.self_internal_network") }
+
+if 'tinc' in lookup("group_names") {
+  class {'tinc':
+    tinc_name           => lookup("tinc_global.name"),
+    tinc_location       => lookup("network.tinc.location"),
+    tinc_connect_to     => $tinc_connect_to,
+    tinc_locations      => $tinc_locations,
+    tinc_ip             => lookup("network.self_internal_ip"),
+    tinc_netmask        => lookup("network.self_internal_netmask"),
+    tinc_other_networks => $tinc_other_networks,
+  }
+}