From: mh <mh@immerda.ch>
Date: Fri, 13 Jun 2008 20:26:23 +0000 (+0000)
Subject: merged with puzzle
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=018232e2117764e636e6fc53ccd65cd4a60c9409;p=puppet-resolvconf.git

merged with puzzle
---

diff --git a/files/.git_placeholder b/files/.git_placeholder
new file mode 100644
index 0000000..89cb1fe
--- /dev/null
+++ b/files/.git_placeholder
@@ -0,0 +1 @@
+# file needed for git - don't remove it
diff --git a/manifests/init.pp b/manifests/init.pp
index fb57059..1f5f986 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,16 @@
-# modules/resolvconf/manifests/init.pp - manage resolvconf stuff
-# Copyright (C) 2007 admin@immerda.ch
-# GPLv3
+#
+# 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.
+#
 
 # modules_dir { "resolvconf": }
 
@@ -25,9 +35,4 @@ class resolvconf {
         mode => 444,
         content => template("resolvconf/resolvconf.erb")
     }
-
-
 }
-
-
-