diff options
| author | varac <varacanero@zeromail.org> | 2013-03-11 15:14:11 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-11 15:14:11 +0100 |
| commit | 8133f60f52492df6d936eb3b9d33275c9f048708 (patch) | |
| tree | 2cd9bafb327abee123a3cff97adce88891103660 | |
| parent | 659e3604a310029000c9db8774c7caba70a3e291 (diff) | |
include bigcouch::debian in init.pp instead of bigcouch.pp
| -rw-r--r-- | manifests/bigcouch.pp | 11 | ||||
| -rw-r--r-- | manifests/init.pp | 7 |
2 files changed, 6 insertions, 12 deletions
diff --git a/manifests/bigcouch.pp b/manifests/bigcouch.pp index 67d8691..bfed611 100644 --- a/manifests/bigcouch.pp +++ b/manifests/bigcouch.pp @@ -1,16 +1,5 @@ class couchdb::bigcouch inherits couchdb::base { - case $::operatingsystem { - Debian: { - case $::lsbdistcodename { - /squeeze|wheezy/: { #include couchdb::bigcouch::debian - } - default: { fail "bigcouch not available for ${::operatingsystem}/${::lsbdistcodename}" } - } - } - default: { fail "bigcouch not available for ${::operatingsystem}/${::lsbdistcodename}" } - } - apt::sources_list {'bigcouch-cloudant.list': content => "deb http://packages.cloudant.com/debian $::lsbdistcodename main" } diff --git a/manifests/init.pp b/manifests/init.pp index 25a0cde..820c71d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,7 +5,12 @@ class couchdb ( case $::operatingsystem { Debian: { case $::lsbdistcodename { - /lenny|squeeze|wheezy/: { include couchdb::debian } + /lenny|squeeze|wheezy/: { + include couchdb::debian + if $bigcouch == true { + include couchdb::bigcouch::debian + } + } default: { fail "couchdb not available for ${::operatingsystem}/${::lsbdistcodename}" } } } |