Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / ferm / manifests / per_host.pp

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 79dce40..fb38cb3 100644 (file)
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -3,7 +3,7 @@ class ferm::per_host {
                include ferm::zivit
        }
 
-       if (getfromhash($site::nodeinfo, 'hoster', 'name') == "aql") {
+       if (getfromhash($deprecated::nodeinfo, 'hoster', 'name') == "aql") {
                include ferm::aql
        }
 
@@ -97,11 +97,11 @@ class ferm::per_host {
                                # quantz, master, coccia
                                rule            => @("EOF")
                                        &SERVICE_RANGE(tcp, 5452, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'master.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'master.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
                                        ))
                                        | EOF
                        }
@@ -112,7 +112,7 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5433, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'bmdb1.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'bmdb1.debian.org', 'ipHostNumber'), " ") }
                                                \$HOST_PGBACKUPHOST
                                        ))
                                        | EOF
@@ -124,14 +124,14 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5435, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'ticharich.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'petrova.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'rusca.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'tate.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ticharich.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'petrova.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'rusca.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'tate.debian.org', 'ipHostNumber'), " ") }
                                                \$HOST_PGBACKUPHOST
                                        ))
                                        | EOF
@@ -141,13 +141,13 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5434, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'nono.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'usper.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'nono.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'usper.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
                                        ))
                                        | EOF
                        }
@@ -156,9 +156,9 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5436, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
                                                \$HOST_PGBACKUPHOST
                                        ))
                                        | EOF
@@ -168,8 +168,8 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5437, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
                                                \$HOST_PGBACKUPHOST
                                        ))
                                        | EOF
@@ -179,7 +179,7 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5439, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'delfin.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'delfin.debian.org', 'ipHostNumber'), " ") }
                                        ))
                                        | EOF
                        }
@@ -188,7 +188,7 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5440, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
                                                \$HOST_PGBACKUPHOST
                                        ))
                                        | EOF
@@ -233,8 +233,8 @@ class ferm::per_host {
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
                                        &SERVICE_RANGE(tcp, 5473, (
-                                               ${ join(getfromhash($site::allnodeinfo, 'lw07.debian.org', 'ipHostNumber'), " ") }
-                                               ${ join(getfromhash($site::allnodeinfo, 'snapshotdb-manda-01.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'lw07.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'snapshotdb-manda-01.debian.org', 'ipHostNumber'), " ") }
                                                \$HOST_PGBACKUPHOST
                                        ))
                                        | EOF