diff --git a/nodes/akkounts-1.json b/nodes/akkounts-1.json index 14dce01..174a57a 100644 --- a/nodes/akkounts-1.json +++ b/nodes/akkounts-1.json @@ -42,14 +42,16 @@ "postfix::_attributes", "postfix::sasl_auth", "hostname::default", + "redisio::default", + "redisio::_install_prereqs", + "redisio::install", + "ulimit::default", + "redisio::disable_os_default", + "redisio::configure", + "redisio::enable", "kosmos-nodejs::default", "nodejs::nodejs_from_package", "nodejs::repo", - "kosmos-redis::default", - "redis::server", - "redis::default", - "backup::default", - "logrotate::default", "nodejs::npm", "nodejs::install", "kosmos-nginx::default", diff --git a/site-cookbooks/kosmos-akkounts/attributes/default.rb b/site-cookbooks/kosmos-akkounts/attributes/default.rb index 782ba9e..8b2ad05 100644 --- a/site-cookbooks/kosmos-akkounts/attributes/default.rb +++ b/site-cookbooks/kosmos-akkounts/attributes/default.rb @@ -8,3 +8,5 @@ node.default['akkounts_api']['domain'] = 'api.kosmos.org' node.default['akkounts']['lndhub']['api_url'] = nil node.default['akkounts']['lndhub']['public_url'] = nil node.default['akkounts']['lndhub']['postgres_db'] = 'lndhub' + +node.override["redisio"]["version"] = "6.2.6" diff --git a/site-cookbooks/kosmos-akkounts/metadata.rb b/site-cookbooks/kosmos-akkounts/metadata.rb index 98f70bd..8e0cf07 100644 --- a/site-cookbooks/kosmos-akkounts/metadata.rb +++ b/site-cookbooks/kosmos-akkounts/metadata.rb @@ -9,7 +9,7 @@ chef_version '>= 14.0' depends 'kosmos-nginx' depends "kosmos-nodejs" -depends "kosmos-redis" +depends "redisio" depends "poise-ruby-build" depends "application" depends 'application_git' diff --git a/site-cookbooks/kosmos-akkounts/recipes/default.rb b/site-cookbooks/kosmos-akkounts/recipes/default.rb index 4543b38..212d9d0 100644 --- a/site-cookbooks/kosmos-akkounts/recipes/default.rb +++ b/site-cookbooks/kosmos-akkounts/recipes/default.rb @@ -20,8 +20,9 @@ end package "libpq-dev" +include_recipe 'redisio::default' +include_recipe 'redisio::enable' include_recipe 'kosmos-nodejs' -include_recipe "kosmos-redis" npm_package "yarn" do version "1.22.4" @@ -82,7 +83,8 @@ systemd_unit "akkounts.service" do Unit: { Description: "Kosmos Accounts", Documentation: ["https://gitea.kosmos.org/kosmos/akkounts"], - After: "network.target" + Requires: "redis@6379.service", + After: "syslog.target network.target" }, Service: { Type: "simple", @@ -110,8 +112,8 @@ systemd_unit "akkounts-sidekiq.service" do Unit: { Description: "Kosmos Accounts async/background jobs", Documentation: ["https://gitea.kosmos.org/kosmos/akkounts"], - Requires: "redis-server.service", - After: "syslog.target network.target redis-server.service" + Requires: "redis@6379.service", + After: "syslog.target network.target redis@6379.service" }, Service: { Type: "notify",