diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-04 12:36:24 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-04 12:36:24 -0400 |
| commit | dc367e53b45349ef849247fc93c664c548c90359 (patch) | |
| tree | 14531add8c5bf7ac20f66c9dff0262319b7b0133 /manifests/bigcouch | |
| parent | 66d918ddb6454fd4a30baed9b49baad98e274243 (diff) | |
clean-up commit: lint, standardize spacing, properly enclose variables, etc
Diffstat (limited to 'manifests/bigcouch')
| -rw-r--r-- | manifests/bigcouch/debian.pp | 2 | ||||
| -rw-r--r-- | manifests/bigcouch/package/cloudant.pp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/manifests/bigcouch/debian.pp b/manifests/bigcouch/debian.pp index 54ca882..8af3993 100644 --- a/manifests/bigcouch/debian.pp +++ b/manifests/bigcouch/debian.pp @@ -1,7 +1,9 @@ class couchdb::bigcouch::debian inherits couchdb::debian { + File ['/etc/init.d/couchdb'] { ensure => absent } + file {'/etc/init.d/bigcouch': ensure => link, target => '/usr/bin/sv' diff --git a/manifests/bigcouch/package/cloudant.pp b/manifests/bigcouch/package/cloudant.pp index 4c44e74..88ee8da 100644 --- a/manifests/bigcouch/package/cloudant.pp +++ b/manifests/bigcouch/package/cloudant.pp @@ -1,19 +1,17 @@ class couchdb::bigcouch::package::cloudant { - - # cloudants signing key can be fetched from + # cloudant's signing key can be fetched from # http://packages.cloudant.com/KEYS, please use the apt module to - # distribute it on your servers - # It's verified fingerprint is: - # BAF9 B315 D438 5FB9 B5DE 334B 59E0 1FBD 15BE 8E26 + # distribute it on your servers after verifying its fingerprint apt::sources_list {'bigcouch-cloudant.list': content => 'deb http://packages.cloudant.com/debian squeeze main' } # right now, cloudant only provides authenticated ibigcouch 0.4.2 packages - # for squeeze, therefore we need to include squeeze repo for depending + # for squeeze, therefore we need to include squeeze repo for depending # packages + if $::lsbdistcodename == 'wheezy' { apt::sources_list {'squeeze.list': content => 'deb http://http.debian.net/debian squeeze main |