From 6807b8f5bcef6299618a264982f0ebd1628e92fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 10 Jul 2026 11:24:42 +0200 Subject: [PATCH 1/2] Update akkounts cookbook, deploy new akkounts VM * Fix: add missing directory resource * New nodejs cookbook usage * Remove Redis entirely (not using local Redis anymore) --- site-cookbooks/kosmos-akkounts/metadata.rb | 3 +-- site-cookbooks/kosmos-akkounts/recipes/default.rb | 14 ++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/site-cookbooks/kosmos-akkounts/metadata.rb b/site-cookbooks/kosmos-akkounts/metadata.rb index 7accd9c..7cf9255 100644 --- a/site-cookbooks/kosmos-akkounts/metadata.rb +++ b/site-cookbooks/kosmos-akkounts/metadata.rb @@ -4,12 +4,11 @@ maintainer_email 'mail@kosmos.org' license 'MIT' description 'Installs/configures kosmos-akkounts' long_description 'Installs/configures kosmos-akkounts' -version '0.2.0' +version '0.3.0' chef_version '>= 18.0' depends 'kosmos_openresty' depends "kosmos-nodejs" -depends "redisio" depends "postgresql" depends "kosmos_postgresql" depends "backup" diff --git a/site-cookbooks/kosmos-akkounts/recipes/default.rb b/site-cookbooks/kosmos-akkounts/recipes/default.rb index f8ec675..1a14418 100644 --- a/site-cookbooks/kosmos-akkounts/recipes/default.rb +++ b/site-cookbooks/kosmos-akkounts/recipes/default.rb @@ -19,13 +19,16 @@ user deploy_user do shell "/bin/bash" end +directory deploy_path do + owner deploy_user + group deploy_group + mode "0755" +end + package "libpq-dev" package "libvips" -include_recipe 'redisio::default' -include_recipe 'redisio::enable' - -node.override["nodejs"]["repo"] = "https://deb.nodesource.com/node_20.x" +node.override["kosmos_nodejs"]["version"] = "22.23.1" include_recipe 'kosmos-nodejs' npm_package "bun" @@ -34,7 +37,7 @@ ruby_path = "/opt/ruby_build/builds/#{ruby_version}" bundle_path = "#{ruby_path}/bin/bundle" rails_env = node.chef_environment == "development" ? "development" : "production" -ruby_build_install 'v20240221' +ruby_build_install 'v20260701' ruby_build_definition ruby_version do prefix_path ruby_path end @@ -221,7 +224,6 @@ systemd_unit "akkounts.service" do Unit: { Description: "Kosmos Accounts", Documentation: ["https://gitea.kosmos.org/kosmos/akkounts"], - Requires: "redis@6379.service", After: "syslog.target network.target" }, Service: { -- 2.50.1 From 9250b2c726c8e68c5a81cb26b26f3bb84e9a24e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 10 Jul 2026 11:27:01 +0200 Subject: [PATCH 2/2] Deploy new akkounts node, remove old one --- clients/akkounts-1.json | 4 --- clients/akkounts-2.json | 4 +++ nodes/{akkounts-1.json => akkounts-2.json} | 31 +++++++--------------- 3 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 clients/akkounts-1.json create mode 100644 clients/akkounts-2.json rename nodes/{akkounts-1.json => akkounts-2.json} (72%) diff --git a/clients/akkounts-1.json b/clients/akkounts-1.json deleted file mode 100644 index 90e44d7..0000000 --- a/clients/akkounts-1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "akkounts-1", - "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0LKcqydrG3zgtmThEg+q\nOcw8QvIB2usMkF4kNMFeqhhdr2q/AtRcq4RJ0u0MiZbkHduGWfG9QZpjmbFZcEke\nURJbddqSDPHFAtrK2+BpcMqNN/mSp59f4MJf6wdLnBoeZCF5pCCXibyj+/754Ly+\nEJNiB1sf1Lu82YW2YM7iLhOLk1QQD2DTfBGbj9swdPrgKK+1npQ4A7O8sOB5gDjb\n9QVLCvCEoYFi+9is0vw/YryEr6tfnNw+CroP2uDfyVfWznF8oPUuttAcHgqDA3CV\n7lCRk9yVt1FKwuq2lFcsMqZ7wO4EoxpzCz/XTnpFPFvgeVinyXjSPsQCBAdwJe5T\nWQIDAQAB\n-----END PUBLIC KEY-----\n" -} \ No newline at end of file diff --git a/clients/akkounts-2.json b/clients/akkounts-2.json new file mode 100644 index 0000000..09936ce --- /dev/null +++ b/clients/akkounts-2.json @@ -0,0 +1,4 @@ +{ + "name": "akkounts-2", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi/0X3npRvDRwPVRIWu4z\nY+9Qnj7EONuarsZ5aVuuVV/sqUpdJoQB/zYCxrF3HvNXbaDDOmIKiUiTfttWdcVK\nOIXH1IcykFSXFzT5tBof+kRVTHIVp5vtR1dAi1eCm1i7CId52Zqti0aF2/08XVUy\npWOJLlDObwn/M6i0gAQs/kGtYkFhlvZrmAkrlDYCzHb1nalyATohS9n/aNn8bvY1\noSPZb4vmlW4ln5y+tqJf8fOWlfUiIdgRnsQKFa97ijfQFbv1TGv33rhqDdsjR2jn\n7qJmYQ7U83W2cGhBiUR7N4rWY0Mig3e9UeOufVpNDLVvRcXZWx1pzDyn9pD6lk+7\nFwIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/nodes/akkounts-1.json b/nodes/akkounts-2.json similarity index 72% rename from nodes/akkounts-1.json rename to nodes/akkounts-2.json index 7af0bda..5dad0ab 100644 --- a/nodes/akkounts-1.json +++ b/nodes/akkounts-2.json @@ -1,18 +1,18 @@ { - "name": "akkounts-1", + "name": "akkounts-2", "chef_environment": "production", "normal": { "knife_zero": { - "host": "10.1.1.144" + "host": "10.1.1.120" }, - "vm_host": "draco" + "vm_host": "leo" }, "automatic": { - "fqdn": "akkounts-1", + "fqdn": "akkounts-2", "os": "linux", - "os_version": "5.4.0-223-generic", - "hostname": "akkounts-1", - "ipaddress": "192.168.122.160", + "os_version": "6.8.0-134-generic", + "hostname": "akkounts-2", + "ipaddress": "192.168.122.157", "roles": [ "base", "kvm_guest", @@ -38,8 +38,6 @@ "apt::default", "timezone_iii::default", "timezone_iii::debian", - "ntp::default", - "ntp::apparmor", "kosmos-base::journald_conf", "kosmos-base::systemd_emails", "apt::unattended-upgrades", @@ -51,21 +49,10 @@ "postfix::sasl_auth", "hostname::default", "firewall::default", - "redisio::default", - "redisio::_install_prereqs", - "redisio::install", - "redisio::ulimit", - "redisio::disable_os_default", - "redisio::configure", - "redisio::enable", - "kosmos-nodejs::default", - "nodejs::nodejs_from_package", - "nodejs::repo", - "nodejs::npm", - "nodejs::install" + "kosmos-nodejs::default" ], "platform": "ubuntu", - "platform_version": "20.04", + "platform_version": "24.04", "cloud": null, "chef_packages": { "chef": { -- 2.50.1