same for searchpaths

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

diff --git a/hieradata/1und1-sec.yaml b/hieradata/1und1-sec.yaml
index df39e3877a27d7de8b884f16d425ba7b033d0dab..21811990f51e342a4ea59cdfb25733cd2f887310 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 109f72fa77638c64527d591a210c64894dcd7c6e..b87329ca1b8935abf1ec5503285da80e549afb02 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 76c4aadc48c99a576015cdf21eb89d8900d3884f..06d5cc14fbb4074ae5d6b800edd91526e8b966c7 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 27d2b6d4869cdd45c719aa375bef0b0280fff606..98847223a0fce0e0e60e3f695dd2be38d33401f7 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 25c8fc853dd5b93b8906a015fab0410243feca7e..69d3443f0aa1fcf0cf67e2f65021869b0b228ddc 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 fbb08aa17ece8c4dd8b8781c205733d9ff693c34..7dce983e9355969918866b4708a968e0da77e40f 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 8fc5d2e0bf76450bd2a929a0b20acd7c276a4f92..186a9a4e2f55bf240fa455d5f9497de9af7b3103 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 2e72e8d0ce63a52ee69d423256a2f393f702af04..03bf7febafd99ff4ae43df4b7c3005b39846a692 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 0d74f2f12f7c9d07d1894907cd605931c39d096c..924b187de96f191df8487822540e429152bcf1e6 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 152e392342053677399401df9fbdb63550baadb8..225c93c94644550cb6271fee099139718e049792 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 2ca70739f6a8c2199e11ad24194bccbd5de85128..34ea6af0a955d6cc2e2175966fadccb9473f5015 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"