From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:41:59 -0400 Subject: remove submodules in preparation for move to subrepos Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6 --- puppet/modules/resolvconf | 1 - 1 file changed, 1 deletion(-) delete mode 160000 puppet/modules/resolvconf (limited to 'puppet/modules/resolvconf/templates') diff --git a/puppet/modules/resolvconf b/puppet/modules/resolvconf deleted file mode 160000 index c7eca077..00000000 --- a/puppet/modules/resolvconf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c7eca077fdda063edc96d3bea02c4774569e4b10 -- cgit v1.2.3 From 81210aea5cf136194598e7a399ce307ecbe088f1 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:45:52 -0400 Subject: git subrepo clone https://leap.se/git/puppet_resolvconf puppet/modules/resolvconf subrepo: subdir: "puppet/modules/resolvconf" merged: "c7eca07" upstream: origin: "https://leap.se/git/puppet_resolvconf" branch: "master" commit: "c7eca07" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "1e79595" Change-Id: I41a76bde0943f76786b7a67c3b9ee4a6b4db7f28 --- puppet/modules/resolvconf/templates/resolvconf.OpenBSD.erb | 5 +++++ puppet/modules/resolvconf/templates/resolvconf.erb | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 puppet/modules/resolvconf/templates/resolvconf.OpenBSD.erb create mode 100644 puppet/modules/resolvconf/templates/resolvconf.erb (limited to 'puppet/modules/resolvconf/templates') diff --git a/puppet/modules/resolvconf/templates/resolvconf.OpenBSD.erb b/puppet/modules/resolvconf/templates/resolvconf.OpenBSD.erb new file mode 100644 index 00000000..48daf279 --- /dev/null +++ b/puppet/modules/resolvconf/templates/resolvconf.OpenBSD.erb @@ -0,0 +1,5 @@ +# managed by puppet +lookup file bind +<% scope.lookupvar('resolvconf::nameservers').each do |nameserver| -%> +nameserver <%= nameserver %> +<% end -%> diff --git a/puppet/modules/resolvconf/templates/resolvconf.erb b/puppet/modules/resolvconf/templates/resolvconf.erb new file mode 100644 index 00000000..d8136bfb --- /dev/null +++ b/puppet/modules/resolvconf/templates/resolvconf.erb @@ -0,0 +1,7 @@ +# managed by puppet +domain <%= scope.lookupvar('resolvconf::domain') %> +search <%= scope.lookupvar('resolvconf::search') %> + +<% scope.lookupvar('resolvconf::nameservers').each do |nameserver| -%> +nameserver <%= nameserver %> +<% end -%> -- cgit v1.2.3