From 76fd629e40cf0528cd607a760d4ca14e32a47541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 2 Nov 2022 21:02:14 +0100 Subject: [PATCH] Deploy new kredits ipfs-pinner refs https://gitea.kosmos.org/kredits/meta/issues/10 --- nodes/ipfs-1.json | 7 ++++--- roles/kredits_ipfs_pinner.rb | 11 +++++++++++ site-cookbooks/kosmos-ipfs/attributes/default.rb | 2 +- .../kosmos-ipfs/recipes/kredits_pinner.rb | 16 ++++++++++++---- site-cookbooks/kosmos-nodejs/recipes/default.rb | 4 ++-- 5 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 roles/kredits_ipfs_pinner.rb diff --git a/nodes/ipfs-1.json b/nodes/ipfs-1.json index 637f7f2..c26d26b 100644 --- a/nodes/ipfs-1.json +++ b/nodes/ipfs-1.json @@ -8,7 +8,7 @@ "automatic": { "fqdn": "ipfs-1", "os": "linux", - "os_version": "5.4.0-110-generic", + "os_version": "5.4.0-131-generic", "hostname": "ipfs-1", "ipaddress": "192.168.122.195", "roles": [ @@ -21,6 +21,7 @@ "kosmos-ipfs", "kosmos-ipfs::default", "kosmos-ipfs::public_gateway", + "kosmos-ipfs::kredits_pinner", "apt::default", "timezone_iii::default", "timezone_iii::debian", @@ -39,7 +40,6 @@ "ipfs::_user", "firewall::default", "chef-sugar::default", - "kosmos-ipfs::kredits_pinner", "kosmos-nodejs::default", "nodejs::nodejs_from_package", "nodejs::repo", @@ -75,6 +75,7 @@ "recipe[kosmos-base]", "role[kvm_guest]", "recipe[kosmos-ipfs]", - "recipe[kosmos-ipfs::public_gateway]" + "recipe[kosmos-ipfs::public_gateway]", + "recipe[kosmos-ipfs::kredits_pinner]" ] } \ No newline at end of file diff --git a/roles/kredits_ipfs_pinner.rb b/roles/kredits_ipfs_pinner.rb new file mode 100644 index 0000000..65f7162 --- /dev/null +++ b/roles/kredits_ipfs_pinner.rb @@ -0,0 +1,11 @@ +name 'kredits_ipfs_pinner' + +default_run_list = %w( + kosmos-ipfs::kredits_pinner +) + +env_run_lists( + '_default' => default_run_list, + 'development' => default_run_list, + 'production' => default_run_list +) diff --git a/site-cookbooks/kosmos-ipfs/attributes/default.rb b/site-cookbooks/kosmos-ipfs/attributes/default.rb index ee892d9..023d6c0 100644 --- a/site-cookbooks/kosmos-ipfs/attributes/default.rb +++ b/site-cookbooks/kosmos-ipfs/attributes/default.rb @@ -58,4 +58,4 @@ node.default['kosmos-ipfs']['nginx']['external_api_port'] = 5444 node.default['kosmos-ipfs']['nginx']['swarm_p2p_port'] = 4001 node.default['kosmos-ipfs']['nginx']['domain'] = "ipfs.kosmos.org" -node.default['kosmos-ipfs']['kredits-pinner']['revision'] = "v1.0.2" +node.default['kosmos-ipfs']['kredits-pinner']['revision'] = "v2.1.0" diff --git a/site-cookbooks/kosmos-ipfs/recipes/kredits_pinner.rb b/site-cookbooks/kosmos-ipfs/recipes/kredits_pinner.rb index ee95322..492b81d 100644 --- a/site-cookbooks/kosmos-ipfs/recipes/kredits_pinner.rb +++ b/site-cookbooks/kosmos-ipfs/recipes/kredits_pinner.rb @@ -3,15 +3,21 @@ # Recipe:: kredits_pinner # +node.override["nodejs"]["repo"] = "https://deb.nodesource.com/node_16.x" + include_recipe 'kosmos-nodejs' -app_name = "kredits-ipfs-pinner" +app_name = "ipfs-pinner" deploy_user = "ipfs" deploy_group = "ipfs" group deploy_group path_to_deploy = "/opt/#{app_name}" + +rsk_node_ip = search(:node, "role:rskj_testnet").first["knife_zero"]["host"] +rsk_rpc_url = "http://#{rsk_node_ip}:4444" + application path_to_deploy do owner deploy_user group deploy_group @@ -19,7 +25,7 @@ application path_to_deploy do git do user deploy_user group deploy_group - repository "https://gitea.kosmos.org/kosmos/#{app_name}.git" + repository "https://gitea.kosmos.org/kredits/#{app_name}.git" revision node['kosmos-ipfs']['kredits-pinner']['revision'] end @@ -41,8 +47,10 @@ application path_to_deploy do user: deploy_user, group: deploy_group, app_dir: path_to_deploy, - entry: "/usr/bin/node /usr/bin/npm start", - environment: {} + entry: "/usr/bin/node /usr/bin/npm start -- --watch --rpc-url #{rsk_rpc_url}", + environment: { + 'DEBUG' => 'ipfs-pinner' + } ) notifies :run, "execute[systemctl daemon-reload]", :delayed notifies :restart, "service[#{app_name}]", :delayed diff --git a/site-cookbooks/kosmos-nodejs/recipes/default.rb b/site-cookbooks/kosmos-nodejs/recipes/default.rb index 5257605..935dead 100644 --- a/site-cookbooks/kosmos-nodejs/recipes/default.rb +++ b/site-cookbooks/kosmos-nodejs/recipes/default.rb @@ -3,7 +3,7 @@ # Recipe:: default # -node.override["nodejs"]["repo"] = "https://deb.nodesource.com/node_14.x" +node.normal["nodejs"]["repo"] = "https://deb.nodesource.com/node_14.x" # Allows upgrading -node.override["nodejs"]["package_action"]["nodejs"] = :upgrade +node.normal["nodejs"]["package_action"]["nodejs"] = :upgrade include_recipe "nodejs::nodejs_from_package"