Adding rpcuser parameter

diff --git a/manifests/init.pp b/manifests/init.pp
index 3081978544f692f01977f616fee028d9483b8a10..5139b1d36de15a3e7e7e14f7807aead1ec88235d 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,9 +1,14 @@
 class bitcoind(
   $daemon_args    = hiera('bitcoind::daemon_args',   '-daemon'),
+  $rpcuser        = hiera('bitcoind::rpcuser',       ''),
   $rpcpassword    = hiera('bitcoind::rpcpassword',   ''),
   $ensure         = hiera('bitcoind::ensure',        'running'),
   $maxconnections = hiera('bitcoind::maxconnections', 25)
 ) {
+  case $rpcuser {
+    '': { fail("You need to define etherpad database password! Please set bitcoind::rpcuser in your config") }
+  }
+
   case $rpcpassword {
     '': { fail("You need to define etherpad database password! Please set bitcoind::rpcpassword in your config") }
   }

diff --git a/templates/bitcoin.conf.erb b/templates/bitcoin.conf.erb
index 1e68b85f87235e160608e4a14b8063c508a5750b..14f359f7835a8645208381969360ed7a5e6da849 100644 (file)
--- a/templates/bitcoin.conf.erb
+++ b/templates/bitcoin.conf.erb
@@ -34,6 +34,7 @@ maxconnections=<%= maxconnections %>
 # You must set rpcuser and rpcpassword to secure the JSON-RPC api
 #rpcuser=Ulysseys
 #rpcpassword=YourSuperGreatPasswordNumber_385593
+rpcuser=<%= rpcuser %>
 rpcpassword=<%= rpcpassword %>
 
 # By default, only RPC connections from localhost are allowed.  Specify