From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
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/manifests')

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 <micah@leap.se>
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/manifests/init.pp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 puppet/modules/resolvconf/manifests/init.pp

(limited to 'puppet/modules/resolvconf/manifests')

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;
+  }
+}
-- 
cgit v1.2.3