diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-06-16 22:00:29 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-06-16 22:00:29 -0300 |
| commit | 0f0db94b592e014c61c80b1724000e3f2005117f (patch) | |
| tree | a64ff76a79e5832d9c8da6b52264b167893dca24 /manifests | |
| parent | a773a0b28cdbd7746bd0bc53b3b37c709a7e41ca (diff) | |
| download | puppet-nodo-0f0db94b592e014c61c80b1724000e3f2005117f.tar.gz puppet-nodo-0f0db94b592e014c61c80b1724000e3f2005117f.tar.bz2 | |
Adding nodo::subsystem::apt::include_sid config
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/role/bitcoin.pp | 5 | ||||
| -rw-r--r-- | manifests/subsystem/apt.pp | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/manifests/role/bitcoin.pp b/manifests/role/bitcoin.pp index fc76128..e1e7e08 100644 --- a/manifests/role/bitcoin.pp +++ b/manifests/role/bitcoin.pp @@ -4,11 +4,6 @@ class nodo::role::bitcoin inherits nodo::base::vserver { include onion::socks include onion::ssh - # Needed for the bitcoind package - apt::sources_list { 'sid.list': - content => "deb http://http.debian.net/debian/ unstable main contrib non-free\n" - } - class { 'bitcoind': daemon_args => '-daemon -nolisten -proxy=127.0.0.1:9050', } diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp index a8f6d6c..c1ea090 100644 --- a/manifests/subsystem/apt.pp +++ b/manifests/subsystem/apt.pp @@ -42,6 +42,16 @@ class nodo::subsystem::apt { } } + $apt_include_sid = hiera('nodo::subsystem::apt::include_sid', false) + + apt::sources_list { 'sid.list': + content => "deb http://http.debian.net/debian/ unstable main contrib non-free\n" + ensure => $apt_include_sid ? { + true => present, + default => absent, + }, + } + package { 'apt-transport-https': ensure => present, } |