diff options
| author | o <o@immerda.ch> | 2012-06-14 11:33:31 -0300 |
|---|---|---|
| committer | o <o@immerda.ch> | 2012-06-14 11:33:31 -0300 |
| commit | 01ab6a5315897efd4d7a52ddaeeecc78a11c1550 (patch) | |
| tree | cd11cf7b993cc468848642a82d06dfe98ca32222 | |
| parent | cd68caf6624baafe5430c1a76d118085cc416429 (diff) | |
some more hiera variables removed
| -rw-r--r-- | manifests/client.pp | 6 | ||||
| -rw-r--r-- | manifests/server.pp | 6 | ||||
| -rw-r--r-- | manifests/server/clientpackage.pp | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 8d2280f..bb1aaa7 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,11 +1,13 @@ -class mysql::client { +class mysql::client ( + $manage_shorewall = false +) { case $::operatingsystem { debian: { include mysql::client::debian } default: { include mysql::client::base } } - if hiera('use_shorewall',false) { + if $manage_shorewall { include shorewall::rules::out::mysql } diff --git a/manifests/server.pp b/manifests/server.pp index 69b253d..ca7ffa9 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -10,18 +10,18 @@ class mysql::server ( default: { include mysql::server::base } } - if $mysql::manage_munin { + if $manage_munin { case $::operatingsystem { debian: { include mysql::server::munin::debian } default: { include mysql::server::munin::default } } } - if $mysql::manage_nagios { + if $manage_nagios { include mysql::server::nagios } - if $mysql::manage_shorewall { + if $manage_shorewall { include shorewall::rules::mysql } } diff --git a/manifests/server/clientpackage.pp b/manifests/server/clientpackage.pp index 8f317c1..1d20ae9 100644 --- a/manifests/server/clientpackage.pp +++ b/manifests/server/clientpackage.pp @@ -1,5 +1,7 @@ class mysql::server::clientpackage inherits mysql::server::base { - include mysql::client + class { 'mysql::client': + manage_shorewall => $mysql::server::manage_shorewall + } File['mysql_setmysqlpass.sh']{ require +> Package['mysql-client'], } |