diff options
| author | Micah Anderson <micah@riseup.net> | 2012-04-04 12:22:09 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-04-04 12:22:09 -0400 |
| commit | db8103b0baff13a82969fa218e344e7707743273 (patch) | |
| tree | 382f28dbd49d35ff0895d9e2727f9732bb9c70f1 /manifests/client.pp | |
| parent | cc65b6c584fbfe4e8e10f91f03a269910a0926c9 (diff) | |
| parent | 64e116cfb5a4247f2e763a3d26354099f3f66f27 (diff) | |
Merge remote-tracking branch 'immerda/master'
Conflicts:
manifests/server/munin/default.pp
manifests/server/nagios.pp
Diffstat (limited to 'manifests/client.pp')
| -rw-r--r-- | manifests/client.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index f375a51..8d2280f 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,12 +1,12 @@ class mysql::client { - case $operatingsystem { + case $::operatingsystem { debian: { include mysql::client::debian } default: { include mysql::client::base } } - if $use_shorewall { + if hiera('use_shorewall',false) { include shorewall::rules::out::mysql } - + } |