Update akkounts cookbook, deploy new akkounts VM #645

Merged
raucao merged 2 commits from chore/akkounts into master 2026-07-10 09:29:45 +00:00
5 changed files with 22 additions and 34 deletions
-4
View File
@@ -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"
}
+4
View File
@@ -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"
}
@@ -1,18 +1,18 @@
{ {
"name": "akkounts-1", "name": "akkounts-2",
"chef_environment": "production", "chef_environment": "production",
"normal": { "normal": {
"knife_zero": { "knife_zero": {
"host": "10.1.1.144" "host": "10.1.1.120"
}, },
"vm_host": "draco" "vm_host": "leo"
}, },
"automatic": { "automatic": {
"fqdn": "akkounts-1", "fqdn": "akkounts-2",
"os": "linux", "os": "linux",
"os_version": "5.4.0-223-generic", "os_version": "6.8.0-134-generic",
"hostname": "akkounts-1", "hostname": "akkounts-2",
"ipaddress": "192.168.122.160", "ipaddress": "192.168.122.157",
"roles": [ "roles": [
"base", "base",
"kvm_guest", "kvm_guest",
@@ -38,8 +38,6 @@
"apt::default", "apt::default",
"timezone_iii::default", "timezone_iii::default",
"timezone_iii::debian", "timezone_iii::debian",
"ntp::default",
"ntp::apparmor",
"kosmos-base::journald_conf", "kosmos-base::journald_conf",
"kosmos-base::systemd_emails", "kosmos-base::systemd_emails",
"apt::unattended-upgrades", "apt::unattended-upgrades",
@@ -51,21 +49,10 @@
"postfix::sasl_auth", "postfix::sasl_auth",
"hostname::default", "hostname::default",
"firewall::default", "firewall::default",
"redisio::default", "kosmos-nodejs::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"
], ],
"platform": "ubuntu", "platform": "ubuntu",
"platform_version": "20.04", "platform_version": "24.04",
"cloud": null, "cloud": null,
"chef_packages": { "chef_packages": {
"chef": { "chef": {
+1 -2
View File
@@ -4,12 +4,11 @@ maintainer_email 'mail@kosmos.org'
license 'MIT' license 'MIT'
description 'Installs/configures kosmos-akkounts' description 'Installs/configures kosmos-akkounts'
long_description 'Installs/configures kosmos-akkounts' long_description 'Installs/configures kosmos-akkounts'
version '0.2.0' version '0.3.0'
chef_version '>= 18.0' chef_version '>= 18.0'
depends 'kosmos_openresty' depends 'kosmos_openresty'
depends "kosmos-nodejs" depends "kosmos-nodejs"
depends "redisio"
depends "postgresql" depends "postgresql"
depends "kosmos_postgresql" depends "kosmos_postgresql"
depends "backup" depends "backup"
@@ -19,13 +19,16 @@ user deploy_user do
shell "/bin/bash" shell "/bin/bash"
end end
directory deploy_path do
owner deploy_user
group deploy_group
mode "0755"
end
package "libpq-dev" package "libpq-dev"
package "libvips" package "libvips"
include_recipe 'redisio::default' node.override["kosmos_nodejs"]["version"] = "22.23.1"
include_recipe 'redisio::enable'
node.override["nodejs"]["repo"] = "https://deb.nodesource.com/node_20.x"
include_recipe 'kosmos-nodejs' include_recipe 'kosmos-nodejs'
npm_package "bun" npm_package "bun"
@@ -34,7 +37,7 @@ ruby_path = "/opt/ruby_build/builds/#{ruby_version}"
bundle_path = "#{ruby_path}/bin/bundle" bundle_path = "#{ruby_path}/bin/bundle"
rails_env = node.chef_environment == "development" ? "development" : "production" rails_env = node.chef_environment == "development" ? "development" : "production"
ruby_build_install 'v20240221' ruby_build_install 'v20260701'
ruby_build_definition ruby_version do ruby_build_definition ruby_version do
prefix_path ruby_path prefix_path ruby_path
end end
@@ -221,7 +224,6 @@ systemd_unit "akkounts.service" do
Unit: { Unit: {
Description: "Kosmos Accounts", Description: "Kosmos Accounts",
Documentation: ["https://gitea.kosmos.org/kosmos/akkounts"], Documentation: ["https://gitea.kosmos.org/kosmos/akkounts"],
Requires: "redis@6379.service",
After: "syslog.target network.target" After: "syslog.target network.target"
}, },
Service: { Service: {