Merge branch 'master' into feature/rskj_public_endpoint

2021-11-28 10:02:06 -06:00
parent 3817284566 7e49dfd520
commit 35115b7391
33 changed files with 509 additions and 169 deletions
--- a/site-cookbooks/kosmos_rsk/attributes/default.rb
+++ b/site-cookbooks/kosmos_rsk/attributes/default.rb
@@ -1,2 +1,2 @@
-node.default['rskj']['version'] = '2.2.0~focal'
+node.default['rskj']['version'] = '3.0.1~focal'
 node.default['rskj']['network'] = 'testnet'
--- a/site-cookbooks/kosmos_rsk/recipes/firewall.rb
+++ b/site-cookbooks/kosmos_rsk/recipes/firewall.rb
@@ -0,0 +1,7 @@
+include_recipe 'firewall'
+
+firewall_rule 'rskj' do
+  port     [4444,50505]
+  protocol :tcp
+  command  :allow
+end
--- a/site-cookbooks/kosmos_rsk/recipes/rskj.rb
+++ b/site-cookbooks/kosmos_rsk/recipes/rskj.rb
@@ -30,10 +30,4 @@ service "rsk" do
  action [:enable, :start]
 end

-include_recipe 'firewall'
-
-firewall_rule 'rskj' do
-  port     [4444,50505]
-  protocol :tcp
-  command  :allow
-end
+include_recipe 'kosmos_rsk::firewall'