diff options
| author | Micah Anderson <micah@riseup.net> | 2011-04-01 13:29:43 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-04-01 13:29:43 -0400 |
| commit | f2846099d1e24589600d6a3a346ab92e5c65f843 (patch) | |
| tree | 9bc6b1ba9502c3bd42b64a4834ef91dc7f7fce5a /manifests/init.pp | |
| parent | 74ccc33ff4f0158e80db4dbc64d4edc490acb26c (diff) | |
| parent | 5c746aa9a4ee5748cbaa6812a508e3dd878b621c (diff) | |
Merge remote-tracking branch 'lavamind/master'
Conflicts:
manifests/daemon.pp
manifests/daemon/disable.pp
manifests/daemon/vhosts.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 812830c..3afce8d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -12,9 +12,14 @@ # class git { - include git::base - if $use_shorewall { - include shorewall::rules::out::git - } + case $operatingsystem { + debian: { include git::debian } + centos: { include git::centos } + } + + if $use_shorewall { + include shorewall::rules::out::git + } + } |