aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/role/bitcoin.pp5
-rw-r--r--manifests/subsystem/apt.pp10
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,
}