diff options
| author | mh <mh@immerda.ch> | 2008-06-13 20:26:23 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-06-13 20:26:23 +0000 |
| commit | 018232e2117764e636e6fc53ccd65cd4a60c9409 (patch) | |
| tree | fcfc44b5981c598f5f450f9a5416ddab1f3a9737 | |
| parent | 6a0cd51463ed5170c67aab56fffa31b977dfdb29 (diff) | |
| download | puppet-resolvconf-018232e2117764e636e6fc53ccd65cd4a60c9409.tar.gz puppet-resolvconf-018232e2117764e636e6fc53ccd65cd4a60c9409.tar.bz2 | |
merged with puzzle
| -rw-r--r-- | files/.git_placeholder | 1 | ||||
| -rw-r--r-- | manifests/init.pp | 21 |
2 files changed, 14 insertions, 8 deletions
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") } - - } - - - |