diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2008-04-22 11:43:26 +0200 |
|---|---|---|
| committer | Marcel Haerry <haerry@puzzle.ch> | 2008-04-22 11:43:26 +0200 |
| commit | 09790b4f100dc0268a65e99a84dc19100594fa75 (patch) | |
| tree | 7f846dff622e0feaca87e5c23e615ce0df12f3ed /manifests/init.pp | |
| parent | b7d5281fa67ff330c28571c9b8df602acba65437 (diff) | |
| parent | ebe1a5fdc83e550529fb11f6dd136bda38a0c689 (diff) | |
merged immerda
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index b8fcd6f..e1f62a6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,8 +1,12 @@ # munin.pp - everything a sitewide munin installation needs # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. +<<<<<<< HEAD:manifests/init.pp # adapted by Puzzle ITC - haerry+puppet(at)puzzle.ch # +======= + +>>>>>>> immerda/master:manifests/init.pp # the port is a parameter so vservers can share IP addresses and still be happy # Define where the individual nodes' configs are stored @@ -14,4 +18,6 @@ import "host.pp" import "client.pp" import "plugin.pp" -include assert_lsbdistcodename +case $operatingsystem { + debian,ubuntu: { include assert_lsbdistcodename } +} |