diff options
| author | varac <varacanero@zeromail.org> | 2015-11-30 15:36:41 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-30 15:36:41 +0100 |
| commit | 20b2b4cc8ee1e85cf1bc8dfaa4db9fb70dcac72b (patch) | |
| tree | 8ece37864361ccd2d294e5553bd299ea6a93629d /puppet/modules | |
| parent | 58c4e6878561dc9772070e3ca9b666b9e1abdc7a (diff) | |
Revert "[feat] install couchdb from unstable on jessie"
This reverts commit 02b1b484ad9a5d065ceac72b8263b7bcc112c923.
Now that we have a proper couchdb jessie package we don't need to
install it from Debian unstable.
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_apt/manifests/sid_repo.pp | 11 | ||||
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/master.pp | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/puppet/modules/site_apt/manifests/sid_repo.pp b/puppet/modules/site_apt/manifests/sid_repo.pp deleted file mode 100644 index 7c1d8783..00000000 --- a/puppet/modules/site_apt/manifests/sid_repo.pp +++ /dev/null @@ -1,11 +0,0 @@ -# configure debian unstable aka "sid" -# currently only used for installations that -# use plain couchdb instead of bigcouch -class site_apt::sid_repo { - - apt::sources_list { 'debian_sid.list': - content => "deb http://httpredir.debian.org/debian/ sid main\n", - before => Exec[refresh_apt] - } - -} diff --git a/puppet/modules/site_couchdb/manifests/master.pp b/puppet/modules/site_couchdb/manifests/master.pp index c50ed364..5dab6325 100644 --- a/puppet/modules/site_couchdb/manifests/master.pp +++ b/puppet/modules/site_couchdb/manifests/master.pp @@ -7,10 +7,5 @@ class site_couchdb::master { pwhash_alg => $site_couchdb::couchdb_pwhash_alg } - # couchdb is not available in jessie, and the - # leap deb repo only hosts a wheeyz version. - # we install it therefore from unstable - include site_apt::sid_repo - include site_check_mk::agent::couchdb::master } |