same for searchpaths

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/hieradata/1und1-sec.yaml b/hieradata/1und1-sec.yaml
index df39e38..2181199 100644 (file)
--- a/hieradata/1und1-sec.yaml
+++ b/hieradata/1und1-sec.yaml
@@ -3,3 +3,5 @@ nameservers:
   - 195.20.224.99
   - 195.20.224.234
   - 87.106.64.251
+searchpaths:
+  - debprivate-oneandone.debian.org

diff --git a/hieradata/accumu.yaml b/hieradata/accumu.yaml
index 109f72f..b87329c 100644 (file)
--- a/hieradata/accumu.yaml
+++ b/hieradata/accumu.yaml
@@ -3,3 +3,5 @@ nameservers:
   - 130.239.18.145
   - 130.239.1.90
   - 130.239.4.100
+searchpaths:
+  - debprivate-accumu.debian.org

diff --git a/hieradata/brainfood.yaml b/hieradata/brainfood.yaml
new file mode 100644 (file)
index 0000000..4cb141c
--- /dev/null
+++ b/hieradata/brainfood.yaml
@@ -0,0 +1,3 @@
+---
+searchpaths:
+  - debprivate-brainfood.debian.org

diff --git a/hieradata/csail.yaml b/hieradata/csail.yaml
index 76c4aad..06d5cc1 100644 (file)
--- a/hieradata/csail.yaml
+++ b/hieradata/csail.yaml
@@ -3,3 +3,5 @@ nameservers:
   - 128.30.2.24
   - 128.30.2.25
   - 128.30.0.125
+searchpaths:
+  - debprivate-csail.debian.org

diff --git a/hieradata/ftcollins.yaml b/hieradata/ftcollins.yaml
index 27d2b6d..9884722 100644 (file)
--- a/hieradata/ftcollins.yaml
+++ b/hieradata/ftcollins.yaml
@@ -2,3 +2,5 @@
 nameservers:
   - 192.25.206.33
   - 192.25.206.57
+searchpaths:
+  - debprivate-ftcollins.debian.org

diff --git a/hieradata/grnet.yaml b/hieradata/grnet.yaml
index 25c8fc8..69d3443 100644 (file)
--- a/hieradata/grnet.yaml
+++ b/hieradata/grnet.yaml
@@ -2,3 +2,5 @@
 nameservers:
   - 194.177.210.10
   - 194.177.210.210
+searchpaths:
+  - debprivate-grnet.debian.org

diff --git a/hieradata/man-da.yaml b/hieradata/man-da.yaml
index fbb08aa..7dce983 100644 (file)
--- a/hieradata/man-da.yaml
+++ b/hieradata/man-da.yaml
@@ -2,3 +2,5 @@
 nameservers:
   - 82.195.66.249
   - 217.198.242.225
+searchpaths:
+  - debprivate-darmstadt.debian.org

diff --git a/hieradata/sanger.yaml b/hieradata/sanger.yaml
index 8fc5d2e..186a9a4 100644 (file)
--- a/hieradata/sanger.yaml
+++ b/hieradata/sanger.yaml
@@ -2,3 +2,5 @@
 nameservers:
   - 193.62.202.28
   - 193.62.202.29
+searchpaths:
+  - debprivate-sanger.debian.org

diff --git a/hieradata/sil.yaml b/hieradata/sil.yaml
index 2e72e8d..03bf7fe 100644 (file)
--- a/hieradata/sil.yaml
+++ b/hieradata/sil.yaml
@@ -2,3 +2,5 @@
 nameservers:
   - 86.59.118.147
   - 86.59.118.148
+searchpaths:
+  - debprivate-sil.debian.org

diff --git a/hieradata/ubcece.yaml b/hieradata/ubcece.yaml
index 0d74f2f..924b187 100644 (file)
--- a/hieradata/ubcece.yaml
+++ b/hieradata/ubcece.yaml
@@ -6,3 +6,5 @@ nameservers:
   - 2607:f8f0:610:4000:218:feff:fe76:2ed0
   - 206.12.19.21
   - 2607:f8f0:610:4000:21c:c4ff:fee5:e890
+searchpaths:
+  - debprivate-ubc.debian.org

diff --git a/modules/resolv/manifests/init.pp b/modules/resolv/manifests/init.pp
index 152e392..225c93c 100644 (file)
--- a/modules/resolv/manifests/init.pp
+++ b/modules/resolv/manifests/init.pp
@@ -1,6 +1,7 @@
 class resolv {
 
        $ns = hiera('nameservers')
+       $sp = hiera('searchpaths')
 
        file { '/etc/resolv.conf':
                        content => template('resolv/resolv.conf.erb');

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 2ca7073..34ea6af 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -13,13 +13,13 @@ if %w{draghi liszt}.include?(hostname)
 end
 
 nameservers += scope.lookupvar('ns')
-searchpaths += scope.lookupvar('site::nodeinfo')['hoster']['searchpaths'] if scope.lookupvar('site::nodeinfo')['hoster']['searchpaths']
 options += scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions'] if scope.lookupvar('site::nodeinfo')['hoster']['resolvoptions']
 
 searchpaths << "debian.org"
+searchpaths += scope.lookupvar('sp')
 
 resolvconf  = ''
-resolvconf += "search " + searchpaths.join(" ") + "\n"
+resolvconf += "search " + searchpaths.to_a.flatten.join(" ") + "\n"
 
 if has_variable?('unbound') and unbound and unbound == "true"
   resolvconf += "nameserver 127.0.0.1\n"