diff --git a/data/location/azure_euwest.yaml b/data/location/azure_euwest.yaml index 9d5ce947..6185413b 100644 --- a/data/location/azure_euwest.yaml +++ b/data/location/azure_euwest.yaml @@ -1,25 +1,24 @@ --- dns::forward_zones: 'internal.softwareheritage.org.': - 192.168.200.22 '100.168.192.in-addr.arpa.': - 192.168.200.22 '101.168.192.in-addr.arpa.': - 192.168.200.22 -dns::forwarders: - - 168.63.129.16 -dns::forwarder_insecure: true +dns::forwarders: [] +dns::forwarder_insecure: false internal_network: 192.168.200.0/21 swh::deploy::worker::instances: - swh_indexer_rehash - swh_indexer_mimetype - swh_indexer_fossology_license - swh_indexer_origin_head - swh_indexer_revision_metadata - swh_indexer_origin_intrinsic_metadata swh::remote_service::storage::config: "%{alias('swh::remote_service::storage::config::azure')}" swh::remote_service::objstorage::config: "%{alias('swh::remote_service::objstorage::config::azure_readonly_with_fallback')}" diff --git a/site-modules/profile/templates/unbound/forwarders.conf.erb b/site-modules/profile/templates/unbound/forwarders.conf.erb index 206c5761..b76096ae 100644 --- a/site-modules/profile/templates/unbound/forwarders.conf.erb +++ b/site-modules/profile/templates/unbound/forwarders.conf.erb @@ -1,15 +1,17 @@ # File managed by puppet (class profile::unbound), all changes will be lost +<% if not @forwarders.empty? -%> forward-zone: name: "." <% @forwarders.each do |forwarder| -%> forward-addr: <%= forwarder %> <% end -%> +<% end -%> <% @forward_zones.each do |zone, forwarders| -%> forward-zone: name: "<%= zone %>" <% forwarders.each do |forwarder| -%> forward-addr: <%= forwarder %> <% end -%> <% end -%>