From 57b269ac93b5117a69a6b538e58bc0e31f0e53d9 Mon Sep 17 00:00:00 2001 From: Jordi Prats Date: Tue, 3 Dec 2019 14:29:45 +0100 Subject: [PATCH] changes resolved --- CHANGELOG.md | 2 ++ README.md | 1 + manifests/resolved.pp | 1 + templates/resolved.erb | 7 ++++++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 685e6da..4b07dfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.2.14 +* Added domains option to **systemd::resolved** - fixes [issue 186](https://github.com/NTTCom-MS/eyp-systemd/issues/168) +* Added Resolve section - fixes [issue 167](https://github.com/NTTCom-MS/eyp-systemd/issues/167) * Allow multiple oncalendar for **systemd::timer** - thanks to [TuningYourCode](https://github.com/TuningYourCode) for this [PR-166](https://github.com/NTTCom-MS/eyp-systemd/pull/166) ## 0.2.13 diff --git a/README.md b/README.md index dd30604..be4d73c 100644 --- a/README.md +++ b/README.md @@ -326,6 +326,7 @@ Base class for refreshing systemd on demand * **dns_stub_listener**: (default: true) * **dnssec**: (default: false) * **cache**: (default: true) +* **domains**: A space-separated list of domains. These domains are used as search suffixes when resolving single-label host names (default: []) #### systemd::logind diff --git a/manifests/resolved.pp b/manifests/resolved.pp index cd99eb3..c3c63a2 100644 --- a/manifests/resolved.pp +++ b/manifests/resolved.pp @@ -8,6 +8,7 @@ $dns_stub_listener = true, $dnssec = false, $cache = true, + $domains = [], ) inherits systemd::params { diff --git a/templates/resolved.erb b/templates/resolved.erb index 1536358..0e2a408 100644 --- a/templates/resolved.erb +++ b/templates/resolved.erb @@ -11,13 +11,18 @@ # Defaults can be restored by simply deleting this file. # # See resolved.conf(5) for details + +[Resolve] + <% if @dns.any? -%> DNS=<%= @dns.join(' ') %> <% end -%> <% if @fallback_dns.any? -%> FallbackDNS=<%= @fallback_dns.join(' ') %> <% end -%> -#Domains= +<% if @domains.any? -%> +Domains=<%= @domains.join(' ') %> +<% end -%> #LLMNR=no #MulticastDNS=no DNSSEC=<%= scope.function_bool2yesno([@dnssec]) %>