diff options
author | mh <mh@immerda.ch> | 2010-07-01 05:23:21 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2010-07-01 05:23:21 +0200 |
commit | 7bbe7a95a66b69e1c937f65801a450b414eeb9a2 (patch) | |
tree | cb02d9d1dc3e6bbb1de895b353d548ae405a5232 | |
parent | 3fc679a8227bd06a050739ce7161fca55abcd487 (diff) | |
parent | ec16a32708eac64bb3189567a0cceb6ac7378353 (diff) |
merge with lavamind
-rw-r--r-- | manifests/client.pp | 10 | ||||
-rw-r--r-- | manifests/client/base.pp | 8 | ||||
-rw-r--r-- | manifests/client/debian.pp | 7 | ||||
-rw-r--r-- | manifests/client/ruby.pp | 7 | ||||
-rw-r--r-- | manifests/client/ruby/debian.pp | 7 | ||||
-rw-r--r--[-rwxr-xr-x] | tests/run_tests | 0 |
6 files changed, 32 insertions, 7 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index cd342be..f375a51 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,12 +1,8 @@ class mysql::client { - package{ 'mysql': - name => $operatingsystem ? { - 'debian' => 'mysql-client', - default => 'mysql', - }, - alias => 'mysql-client', - ensure => present, + case $operatingsystem { + debian: { include mysql::client::debian } + default: { include mysql::client::base } } if $use_shorewall { diff --git a/manifests/client/base.pp b/manifests/client/base.pp new file mode 100644 index 0000000..d992b0f --- /dev/null +++ b/manifests/client/base.pp @@ -0,0 +1,8 @@ +class mysql::client::base { + + package { 'mysql': + ensure => present, + alias => 'mysql-client', + } + +} diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp new file mode 100644 index 0000000..b400c4a --- /dev/null +++ b/manifests/client/debian.pp @@ -0,0 +1,7 @@ +class mysql::client::debian inherits mysql::client::base { + + Package['mysql'] { + name => 'mysql-client', + } + +} diff --git a/manifests/client/ruby.pp b/manifests/client/ruby.pp new file mode 100644 index 0000000..726f63d --- /dev/null +++ b/manifests/client/ruby.pp @@ -0,0 +1,7 @@ +class mysql::client::ruby { + + case $operatingsystem { + debian: { include mysql::client::ruby::debian } + } + +} diff --git a/manifests/client/ruby/debian.pp b/manifests/client/ruby/debian.pp new file mode 100644 index 0000000..3cfa846 --- /dev/null +++ b/manifests/client/ruby/debian.pp @@ -0,0 +1,7 @@ +class mysql::client::ruby::debian { + + package { 'libmysql-ruby': + ensure => present, + } + +} diff --git a/tests/run_tests b/tests/run_tests index 1ae6c42..1ae6c42 100755..100644 --- a/tests/run_tests +++ b/tests/run_tests |