summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2021-06-19 14:27:47 +0200
committerJan Dittberner <jandd@cacert.org>2021-06-19 15:19:46 +0200
commit66003375d4bb7dedc42064bdce0f04aa71fc3d1e (patch)
tree5dfdef158aa1cd76d8d4c245cce62fc17b4b22e0
parent5e6c47298ff18d073c4c8dbd54db3e5f7d67bb2c (diff)
downloadcacert-puppet-66003375d4bb7dedc42064bdce0f04aa71fc3d1e.tar.gz
cacert-puppet-66003375d4bb7dedc42064bdce0f04aa71fc3d1e.tar.xz
cacert-puppet-66003375d4bb7dedc42064bdce0f04aa71fc3d1e.zip
Use infra02 as DNS resolver for infra03
Infra02 has information about all infrastructure hosts and can resolve names like puppet, proxyout, emailout. This commit changes the DNS resolver of infra03 to use infra02.
-rw-r--r--hieradata/common.yaml3
-rw-r--r--sitemodules/profiles/templates/lxc_host/dnsmasq_00infra.epp7
2 files changed, 1 insertions, 9 deletions
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f7ce96d..f9eb48f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -231,5 +231,4 @@ profiles::icinga2_agent::master_certificate: |
5AtYgSC6FbF3WwkRKTz2/KZi5j0oCHqxl31HY1Hx
-----END CERTIFICATE-----
profiles::lxc_host::dns_forward_servers:
- - 172.16.2.2
- - 172.16.2.3
+ - 10.0.0.1
diff --git a/sitemodules/profiles/templates/lxc_host/dnsmasq_00infra.epp b/sitemodules/profiles/templates/lxc_host/dnsmasq_00infra.epp
index 3418104..f82ca62 100644
--- a/sitemodules/profiles/templates/lxc_host/dnsmasq_00infra.epp
+++ b/sitemodules/profiles/templates/lxc_host/dnsmasq_00infra.epp
@@ -9,13 +9,6 @@ no-resolv
server=<%= $server %>
<%- } %>
-local=/<%= $local_domain %>/
interface=<%= $interface %>
no-dhcp-interface=<%= $interface %>
bind-interfaces
-
-expand-hosts
-domain=<%= $local_domain %>
-
-mx-target=<%= $mx_target %>
-localmx