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/.gitrepo | 11 +++++++++ puppet/modules/resolvconf/manifests/init.pp | 27 ++++++++++++++++++++++ .../resolvconf/templates/resolvconf.OpenBSD.erb | 5 ++++ puppet/modules/resolvconf/templates/resolvconf.erb | 7 ++++++ 4 files changed, 50 insertions(+) create mode 100644 puppet/modules/resolvconf/.gitrepo create mode 100644 puppet/modules/resolvconf/manifests/init.pp create mode 100644 puppet/modules/resolvconf/templates/resolvconf.OpenBSD.erb create mode 100644 puppet/modules/resolvconf/templates/resolvconf.erb diff --git a/puppet/modules/resolvconf/.gitrepo b/puppet/modules/resolvconf/.gitrepo new file mode 100644 index 00000000..3359b659 --- /dev/null +++ b/puppet/modules/resolvconf/.gitrepo @@ -0,0 +1,11 @@ +; DO NOT EDIT (unless you know what you are doing) +; +; This subdirectory is a git "subrepo", and this file is maintained by the +; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme +; +[subrepo] + remote = https://leap.se/git/puppet_resolvconf + branch = master + commit = c7eca077fdda063edc96d3bea02c4774569e4b10 + parent = 6209061fd112fed1715676abb7b6ae4697f21d83 + cmdver = 0.3.0 diff --git a/puppet/modules/resolvconf/manifests/init.pp b/puppet/modules/resolvconf/manifests/init.pp new file mode 100644 index 00000000..c22c4ea6 --- /dev/null +++ b/puppet/modules/resolvconf/manifests/init.pp @@ -0,0 +1,27 @@ +# +# resolvconf module +# +# Copyright 2008, admin(at)immerda.ch +# Copyright 2008, Puzzle ITC GmbH +# Marcel Härry haerry+puppet(at)puzzle.ch +# Simon Josi josi+puppet(at)puzzle.ch +# +# This program is free software; you can redistribute +# it and/or modify it under the terms of the GNU +# General Public License version 3 as published by +# the Free Software Foundation. +# + +class resolvconf( + $domain = $::domain, + $search = $::domain, + $nameservers = [ '8.8.8.8' ] +) { + file{'/etc/resolv.conf': + content => $::operatingsystem ? { + openbsd => template("resolvconf/resolvconf.${::operatingsystem}.erb"), + default => template('resolvconf/resolvconf.erb'), + }, + owner => root, group => 0, mode => 0444; + } +} 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