Remove sanitize node script and pre-commit hook

This is no longer needed with the properly set allowed attributes

.chef/config.rb

@@ -8,25 +8,7 @@ data_bag_path             "data_bags"
 encrypted_data_bag_secret "#{current_dir}/encrypted_data_bag_secret"
 local_mode                true # Chef local mode, replacing Solo
 
-# Knife-Zero config, see https://knife-zero.github.io/40_configuration/
-# Prevent attributes from being saved to the node files
-knife[:automatic_attribute_whitelist] = %w[
-  fqdn
-  os
-  os_version
-  hostname
-  ipaddress
-  roles
-  recipes
-  ipaddress
-  platform
-  platform_version
-  cloud
-  cloud_v2
-  chef_packages
-]
-
 # Added to /etc/chef/client.rb on node bootstrap
 # https://docs.chef.io/attribute_persistence/
-knife[:normal_attribute_allowlist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
-knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty']
+# Source of truth: site-cookbooks/kosmos-base/files/default/chef_attributes.rb
+client_d_dir(File.expand_path("../site-cookbooks/kosmos-base/files/default/chef_attributes.rb"))

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "site-cookbooks/deno"]
 	path = site-cookbooks/deno
 	url = git@gitea.kosmos.org:kosmos/deno-cookbook.git
+[submodule "site-cookbooks/blossom"]
+	path = site-cookbooks/blossom
+	url = git@gitea.kosmos.org:kosmos/blossom-cookbook.git

AGENTS.md

@@ -0,0 +1,41 @@
+# AGENTS.md
+
+Welcome, AI Agent! This file contains essential context and rules for interacting with the Kosmos Chef repository. Read this carefully before planning or executing any changes.
+
+## 🏢 Project Overview
+This repository contains the infrastructure automation code used by Kosmos to provision and configure bare metal servers (KVM hosts) and Ubuntu virtual machines (KVM guests). 
+
+We use **Chef Infra**, managed locally via **Knife Zero** (agentless Chef), and **Berkshelf** for dependency management.
+
+## 📂 Directory Structure & Rules
+
+* **`site-cookbooks/`**: 🟢 **EDITABLE.** This directory contains all custom, internal cookbooks written specifically for Kosmos services (e.g., `kosmos-postgresql`, `kosmos_gitea`, `kosmos-mastodon`). *Active development happens here.*
+* **`cookbooks/`**: 🔴 **DO NOT EDIT.** This directory contains third-party/community cookbooks that are vendored. These are managed by Berkshelf. Modifying them directly will result in lost changes.
+* **`roles/`**: 🟢 **EDITABLE.** Contains Chef roles written in Ruby (e.g., `base.rb`, `kvm_guest.rb`, `postgresql_primary.rb`). These define run-lists and role-specific default attributes for servers.
+* **`environments/`**: Contains Chef environment definitions (like `production.rb`).
+* **`data_bags/`**: Contains data bag configurations, often encrypted. Be cautious and do not expose secrets. (Note: Agents should not manage data bag secrets directly unless provided the `.chef/encrypted_data_bag_secret`).
+* **`nodes/`**: Contains JSON state files for bootstrapped nodes. *Agents typically do not edit these directly unless cleaning up a deleted node.*
+* **`Berksfile`**: Defines community cookbook dependencies.
+* **`Vagrantfile` / `.kitchen/`**: Used for local virtualization and integration testing.
+
+## 🛠️ Tooling & Workflows
+
+1. **Dependency Management (Berkshelf)**
+   If a new community cookbook is required:
+   - Add it to the `Berksfile` at the root.
+   - Instruct the user to run `berks install` and `berks vendor cookbooks/ --delete` (or run it via the `bash` tool if permitted).
+
+2. **Provisioning (Knife Zero)**
+   - Bootstrapping and converging nodes is done using `knife zero`. 
+   - *Example:* `knife zero converge name:server-name.kosmos.org`
+
+3. **Code Style & Conventions**
+   - Chef recipes, resources, and roles are written in **Ruby**. 
+   - Follow standard Chef and Ruby (RuboCop) idioms. Look at neighboring files in `site-cookbooks/` or `roles/` to match formatting and naming conventions.
+
+## 🚨 Core Directives for AI Agents
+
+1. **Infrastructure as Code**: Manual server configurations are highly discouraged. All changes must be codified in a cookbook or role.
+2. **Test Safety Nets**: Look for `.kitchen.yml` within specific `site-cookbooks/<name>` to understand if local integration tests are available.
+3. **No Assumptions**: Do not assume standard test commands. Check `README.md` and repository config files first.
+4. **Secret Handling**: Avoid hardcoding passwords or API keys in recipes or roles. Assume sensitive information is managed via Chef `data_bags`.

Berksfile

@@ -13,6 +13,9 @@ cookbook 'ipfs',
 cookbook 'mediawiki',
   git: 'https://github.com/67P/mediawiki-cookbook.git',
   ref: 'nginx'
+cookbook 'postfix',
+  git: 'https://gitea.kosmos.org/kosmos/postfix-cookbook.git',
+  ref: 'bugfix/sasl_attributes'
 
 cookbook 'apache2',                '= 3.3.0'
 cookbook 'apt',                    '~> 7.3.0'
@@ -21,18 +24,18 @@ cookbook 'composer',               '~> 2.7.0'
 cookbook 'fail2ban',               '~> 7.0.4'
 cookbook 'git',                    '~> 10.0.0'
 cookbook 'golang',                 '~> 5.3.1'
+cookbook 'homebrew',               '>= 6.0.0'
 cookbook 'hostname',               '= 0.4.2'
 cookbook 'hostsfile',              '~> 3.0.1'
 cookbook 'java',                   '~> 4.3.0'
 cookbook 'logrotate',              '= 2.2.0'
 cookbook 'mysql',                  '~> 8.7.3'
 cookbook 'nginx',                  '= 9.0.0'
-cookbook 'nodejs',                 '~> 7.3.1'
+cookbook 'nodejs',                 '~> 11.0.1'
 cookbook 'ntp',                    '= 3.4.0'
 cookbook 'ohai',                   '~> 5.2.5'
 cookbook 'openssl',                '~> 8.5.5'
 cookbook 'php',                    '~> 8.0.0'
-cookbook 'postfix',                '~> 6.0.26'
 cookbook 'timezone_iii',           '= 1.0.4'
 cookbook 'ulimit',                 '~> 1.0.0'
 cookbook 'users',                  '~> 5.3.1'

Berksfile.lock

@@ -8,6 +8,7 @@ DEPENDENCIES
   firewall (~> 6.2.16)
   git (~> 10.0.0)
   golang (~> 5.3.1)
+  homebrew (>= 6.0.0)
   hostname (= 0.4.2)
   hostsfile (~> 3.0.1)
   ipfs
@@ -23,12 +24,15 @@ DEPENDENCIES
     ref: nginx
   mysql (~> 8.7.3)
   nginx (= 9.0.0)
-  nodejs (~> 7.3.1)
+  nodejs (~> 11.0.1)
   ntp (= 3.4.0)
   ohai (~> 5.2.5)
   openssl (~> 8.5.5)
   php (~> 8.0.0)
-  postfix (~> 6.0.26)
+  postfix
+    git: https://gitea.kosmos.org/kosmos/postfix-cookbook.git
+    revision: dd6598572a775ae73f17527260ec8097b52d385b
+    ref: bugfix/
   redisio (~> 6.4.1)
   ruby_build (~> 2.5.0)
   timezone_iii (= 1.0.4)
@@ -59,7 +63,7 @@ GRAPH
   git (10.0.0)
   golang (5.3.1)
     ark (>= 6.0)
-  homebrew (5.4.1)
+  homebrew (6.0.2)
   hostname (0.4.2)
     hostsfile (>= 0.0.0)
   hostsfile (3.0.1)
@@ -82,15 +86,16 @@ GRAPH
     build-essential (>= 5.0)
     ohai (>= 4.1.0)
     yum-epel (>= 0.0.0)
-  nodejs (7.3.3)
+  nodejs (11.0.1)
     ark (>= 2.0.2)
     chocolatey (>= 3.0)
+    yum (>= 7.2)
   ntp (3.4.0)
   ohai (5.2.5)
   openssl (8.5.5)
   php (8.0.1)
     yum-epel (>= 0.0.0)
-  postfix (6.0.26)
+  postfix (6.4.1)
   redisio (6.4.1)
     selinux (>= 0.0.0)
   ruby_build (2.5.0)

Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'knife-zero', '>= 2.4.2'
+gem 'knife-zero', '~> 2.6.0'

Gemfile.lock

@@ -1,264 +1,399 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.551.0)
-    aws-sdk-core (3.125.6)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.53.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.3)
-      aws-sdk-core (~> 3, >= 3.125.0)
+    abbrev (0.1.2)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    ast (2.4.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1263.0)
+    aws-sdk-core (3.252.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.129.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.226.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.56.0)
-      aws-sdk-core (~> 3, >= 3.125.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.4.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-secretsmanager (1.133.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt_pbkdf (1.1.0)
-    builder (3.2.4)
-    chef (17.9.42)
+    base64 (0.3.0)
+    bcrypt_pbkdf (1.1.2)
+    bcrypt_pbkdf (1.1.2-arm64-darwin)
+    bcrypt_pbkdf (1.1.2-x86_64-darwin)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
+    builder (3.3.0)
+    chef (19.3.15)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.9.42)
-      chef-utils (= 17.9.42)
+      bcrypt_pbkdf (~> 1.0)
+      chef-config (= 19.3.15)
+      chef-licensing (~> 1.3)
+      chef-utils (= 19.3.15)
       chef-vault
-      chef-zero (>= 14.0.11)
+      chef-zero (~> 15.1.0)
       corefoundation (~> 0.3.4)
-      diff-lcs (>= 1.2.4, < 1.4.0)
+      csv (~> 3.3.5)
+      diff-lcs (~> 1.6.0)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (>= 1.5.0)
+      ffi (>= 1.15.5, < 1.18.0)
       ffi-libarchive (~> 1.0, >= 1.0.3)
-      ffi-yajl (~> 2.2)
+      ffi-yajl (>= 2.2, < 4.0)
       iniparse (~> 1.4)
-      inspec-core (~> 4.23)
+      inspec-core (~> 7.0.107)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
-      mixlib-shellout (>= 3.1.1, < 4.0)
-      net-sftp (>= 2.1.2, < 4.0)
-      ohai (~> 17.0)
+      mixlib-shellout (>= 3.3.8, < 3.5.0)
+      net-ftp
+      net-sftp (>= 2.1.2, < 5.0)
+      ohai (~> 19.0)
       plist (~> 3.2)
-      proxifier (~> 1.0)
+      proxifier2 (~> 1.1)
+      syslog
       syslog-logger (~> 1.6)
-      train-core (~> 3.2, >= 3.2.28)
-      train-winrm (>= 0.2.5)
-      uuidtools (>= 2.1.5, < 3.0)
-      vault (~> 0.16)
-    chef-config (17.9.42)
+      train-core (~> 3.13, >= 3.13.4)
+      train-rest (>= 0.4.1)
+      train-winrm (>= 0.2.17)
+      unf_ext (~> 0.0.9.1)
+      uri (>= 1.0.4, < 1.2.0)
+      vault (>= 0.18.2, < 0.21.0)
+    chef-config (19.3.15)
       addressable
-      chef-utils (= 17.9.42)
+      chef-utils (= 19.3.15)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      tomlrb (~> 1.2)
+      racc
+      tomlrb (>= 1.2, < 3.0)
+    chef-gyoku (1.5.0)
+      builder (>= 2.1.2)
+      rexml (~> 3.4)
+    chef-licensing (1.4.1)
+      chef-config (>= 15)
+      faraday (>= 1, < 3)
+      faraday-http-cache
+      mixlib-log (~> 3.0)
+      ostruct (~> 0.6.0)
+      pstore (~> 0.1.1)
+      tty-prompt (~> 0.23)
+      tty-spinner (~> 0.9.3)
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (17.9.42)
+    chef-utils (19.3.15)
       concurrent-ruby
-    chef-vault (4.1.5)
-    chef-zero (15.0.11)
-      ffi-yajl (~> 2.2)
-      hashie (>= 2.0, < 5.0)
+    chef-vault (4.2.12)
+      syslog (~> 0.3)
+    chef-winrm (2.5.0)
+      builder (>= 2.1.2)
+      chef-gyoku (~> 1.5)
+      erubi (~> 1.8)
+      gssapi (~> 1.2)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.7)
+      rexml (>= 3.4.2, < 4.0)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    chef-winrm-elevated (1.2.5)
+      chef-winrm (>= 2.3.11)
+      chef-winrm-fs (>= 1.3.7)
+      erubi (~> 1.8)
+    chef-winrm-fs (1.4.2)
+      benchmark (~> 0.5.0)
+      chef-winrm (~> 2.4)
+      csv (~> 3.3)
+      erubi (>= 1.7)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 2.0)
+    chef-zero (15.1.11)
+      ffi-yajl (>= 2.2, < 4.0)
+      hashie (>= 2.0, < 6.0)
       mixlib-log (>= 2.0, < 4.0)
-      rack (~> 2.0, >= 2.0.6)
-      uuidtools (~> 2.1)
+      rack (~> 3.2, >= 3.2.6)
+      rackup (~> 2.3, >= 2.3.1)
+      uuidtools (>= 2.1, < 4.0)
       webrick
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    corefoundation (0.3.10)
+    concurrent-ruby (1.3.7)
+    connection_pool (2.5.5)
+    cookstyle (8.7.6)
+      rubocop (= 1.86.1)
+    corefoundation (0.3.19)
       ffi (>= 1.15.0)
-    diff-lcs (1.3)
-    erubi (1.10.0)
+    csv (3.3.5)
+    date (3.5.1)
+    diff-lcs (1.6.2)
+    domain_name (0.6.20240107)
+    ed25519 (1.4.0)
+    erubi (1.13.1)
     erubis (2.7.0)
-    faraday (1.4.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    ffi (1.15.5)
-    ffi-libarchive (1.1.3)
+    faraday (2.14.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-follow_redirects (0.5.0)
+      faraday (>= 1, < 3)
+    faraday-http-cache (2.5.1)
+      faraday (>= 0.8)
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    ffi (1.17.4-arm64-darwin)
+    ffi (1.17.4-x86_64-darwin)
+    ffi (1.17.4-x86_64-linux-gnu)
+    ffi-libarchive (1.1.14)
       ffi (~> 1.0)
-    ffi-yajl (2.4.0)
-      libyajl2 (>= 1.2)
+    ffi-yajl (2.7.11)
+      libyajl2 (>= 2.1)
     fuzzyurl (0.9.0)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashie (4.1.0)
-    highline (2.0.3)
-    httpclient (2.8.3)
+    hashie (5.1.0)
+      logger
+    highline (3.1.2)
+      reline
+    http-accept (1.7.0)
+    http-cookie (1.1.6)
+      domain_name (~> 0.5)
+    httpclient (2.9.0)
+      mutex_m
     iniparse (1.5.0)
-    inspec-core (4.52.9)
+    inspec-core (7.0.107)
       addressable (~> 2.4)
+      chef-licensing (>= 1.2.0)
       chef-telemetry (~> 1.0, >= 1.0.8)
-      faraday (>= 0.9.0, < 1.5)
-      faraday_middleware (~> 1.0)
-      hashie (>= 3.4, < 5.0)
+      cookstyle
+      csv (~> 3.0)
+      faraday (>= 1, < 3)
+      faraday-follow_redirects (~> 0.3)
+      hashie (>= 3.4, < 6.0)
       license-acceptance (>= 0.2.13, < 3.0)
       method_source (>= 0.8, < 2.0)
       mixlib-log (~> 3.0)
       multipart-post (~> 2.0)
+      ostruct (>= 0.1, < 0.7)
       parallel (~> 1.9)
-      parslet (>= 1.5, < 2.0)
+      parslet (>= 1.5, < 3.0)
       pry (~> 0.13)
-      rspec (>= 3.9, < 3.11)
-      rspec-its (~> 1.2)
-      rubyzip (>= 1.2.2, < 3.0)
+      rspec (>= 3.9, <= 3.14)
+      rspec-its (>= 1.2, < 3.0)
+      rubyzip (>= 1.2.2, < 4.0)
       semverse (~> 3.0)
       sslshake (~> 1.2)
-      thor (>= 0.20, < 2.0)
-      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.0)
+      syslog (~> 0.1)
+      thor (>= 0.20, < 1.5.0)
+      tomlrb (>= 1.3, < 2.1)
+      train-core (~> 3.16, >= 3.16.1)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
+    io-console (0.8.2)
     ipaddress (0.8.3)
-    jmespath (1.5.0)
-    json (2.6.1)
-    knife (17.9.26)
+    jmespath (1.6.2)
+    json (2.20.0)
+    knife (19.0.134)
+      abbrev
       bcrypt_pbkdf (~> 1.1)
-      chef (>= 17)
-      chef-config (>= 17)
-      chef-utils (>= 17)
+      chef-licensing (~> 1.2)
       chef-vault
+      ed25519 (>= 1.2, < 2.0)
       erubis (~> 2.7)
-      ffi (>= 1.15)
-      ffi-yajl (~> 2.2)
-      highline (>= 1.6.9, < 3)
+      ffi (>= 1.15, < 1.18.0)
+      ffi-yajl (>= 2.2, < 3.0)
+      highline (>= 1.6.9, < 4)
       license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-cli (>= 2.1.1, < 3.0)
-      net-ssh (>= 5.1, < 7)
+      net-ssh (>= 5.1, < 8)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 17.0)
       pastel
-      train-core (~> 3.2, >= 3.2.28)
-      train-winrm (>= 0.2.5)
+      proxifier2 (~> 1.1)
+      train-core (~> 3.13, >= 3.13.4)
+      train-winrm (>= 0.2.17)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
       tty-table (~> 0.11)
-    knife-zero (2.4.2)
-      chef (>= 15.0)
+    knife-zero (2.6.0)
+      chef (>= 16.6)
       knife (>= 17.0)
+    language_server-protocol (3.17.0.5)
     libyajl2 (2.1.0)
     license-acceptance (2.1.13)
       pastel (~> 0.7)
       tomlrb (>= 1.2, < 3.0)
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
+    lint_roller (1.1.0)
     little-plugger (1.1.4)
-    logging (2.3.0)
+    logger (1.7.0)
+    logging (2.4.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    method_source (1.0.0)
-    mixlib-archive (1.1.7)
+    method_source (1.1.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0701)
+    mixlib-archive (1.3.3)
       mixlib-log
     mixlib-authentication (3.0.10)
     mixlib-cli (2.1.8)
-    mixlib-config (3.0.9)
+    mixlib-config (3.0.27)
       tomlrb
-    mixlib-log (3.0.9)
-    mixlib-shellout (3.2.5)
+    mixlib-log (3.2.3)
+      ffi (>= 1.15.5)
+    mixlib-shellout (3.4.10)
       chef-utils
-    multi_json (1.15.0)
-    multipart-post (2.1.1)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
+    multi_json (1.19.1)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    net-ftp (0.3.9)
+      net-protocol
+      time
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    net-http-persistent (4.0.8)
+      connection_pool (>= 2.2.4, < 4)
+    net-protocol (0.2.2)
+      timeout
+    net-scp (4.1.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.3.3)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    nori (2.6.0)
-    ohai (17.9.0)
-      chef-config (>= 14.12, < 18)
-      chef-utils (>= 16.0, < 18)
-      ffi (~> 1.9)
-      ffi-yajl (~> 2.2)
+    netrc (0.11.0)
+    nori (2.7.1)
+      bigdecimal
+    ohai (19.1.40)
+      base64
+      chef-config (>= 14.12, < 20)
+      chef-utils (>= 16.0, < 20)
+      ffi (>= 1.15.5)
+      ffi-yajl (>= 2.2, < 3.0)
       ipaddress
       mixlib-cli (>= 1.7.0)
       mixlib-config (>= 2.0, < 4.0)
       mixlib-log (>= 2.0.1, < 4.0)
-      mixlib-shellout (~> 3.2, >= 3.2.5)
+      mixlib-shellout (>= 3.3.6, < 3.5.0)
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
-    parallel (1.21.0)
-    parslet (1.8.2)
+    ostruct (0.6.3)
+    parallel (1.28.0)
+    parser (3.3.11.1)
+      ast (~> 2.4.1)
+      racc
+    parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    plist (3.6.0)
-    proxifier (1.0.3)
-    pry (0.14.1)
+    plist (3.7.2)
+    prism (1.9.0)
+    proxifier2 (1.1.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+      reline (>= 0.6.0)
+    pstore (0.1.4)
+    public_suffix (6.0.2)
+    racc (1.8.1)
+    rack (3.2.6)
+    rackup (2.3.1)
+      rack (>= 3)
+    rainbow (3.1.1)
+    regexp_parser (2.12.0)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rexml (3.4.4)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.13.0)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    ruby2_keywords (0.0.5)
-    rubyntlm (0.6.3)
-    rubyzip (2.3.2)
-    semverse (3.0.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.86.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    ruby-progressbar (1.13.0)
+    rubyntlm (0.6.5)
+      base64
+    rubyzip (2.4.1)
+    semverse (3.0.2)
+    socksify (1.8.1)
     sslshake (1.3.1)
     strings (0.2.1)
       strings-ansi (~> 0.2)
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    syslog (0.4.0)
+      logger
     syslog-logger (1.6.8)
-    thor (1.2.1)
-    tomlrb (1.3.0)
-    train-core (3.8.7)
+    thor (1.4.0)
+    time (0.4.2)
+      date
+    timeout (0.6.1)
+    tomlrb (2.0.4)
+    train-core (3.16.5)
       addressable (~> 2.5)
-      ffi (!= 1.13.0)
-      json (>= 1.8, < 3.0)
+      ffi (>= 1.16.0, < 1.18)
+      json (>= 2.19.2, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 4.0)
-      net-ssh (>= 2.9, < 7.0)
-    train-winrm (0.2.12)
-      winrm (>= 2.3.6, < 3.0)
-      winrm-elevated (~> 1.2.2)
-      winrm-fs (~> 1.0)
+      net-scp (>= 1.2, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
+    train-rest (0.5.0)
+      aws-sigv4 (~> 1.5)
+      rest-client (~> 2.1)
+      train-core (~> 3.0)
+    train-winrm (0.4.3)
+      chef-winrm (>= 2.4.4, < 3.0)
+      chef-winrm-elevated (>= 1.2.5, < 2.0)
+      chef-winrm-fs (>= 1.4.1, < 2.0)
+      socksify (~> 1.8)
     tty-box (0.7.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
@@ -272,45 +407,34 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
     tty-table (0.12.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    unicode-display_width (2.1.0)
+    unf_ext (0.0.9.1)
+    unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
-    uuidtools (2.2.0)
-    vault (0.16.0)
+    uri (1.1.1)
+    uuidtools (3.0.0)
+    vault (0.20.1)
       aws-sigv4
-    webrick (1.7.0)
-    winrm (2.3.6)
-      builder (>= 2.1.2)
-      erubi (~> 1.8)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.3)
-      erubi (~> 1.8)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.3.5)
-      erubi (~> 1.8)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 2.0)
-      winrm (~> 2.0)
+      base64
+      net-http-persistent (~> 4.0, >= 4.0.2)
+    webrick (1.9.2)
     wisper (2.0.1)
-    wmi-lite (1.0.5)
+    wmi-lite (1.0.7)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-18
   x86_64-darwin-19
   x86_64-linux
 
 DEPENDENCIES
-  knife-zero (>= 2.4.2)
+  knife-zero (~> 2.6.0)
 
 BUNDLED WITH
    2.2.15

README.md

@@ -54,6 +54,10 @@ Clone this repository, `cd` into it, and run:
 
     knife zero converge name:dev.kosmos.org --client-version 15.3.14
 
+### Upgrade Chef Client on a node:
+
+    knife ssh -a knife_zero.host 'name:foo-1' 'curl -L https://chef.io/chef/install.sh | sudo bash -s -- -v 18.10.17'
+
 ## Managing cookbooks
 
 Cookbooks are managed via Berkshelf. Run `berks --help` for command help.

clients/akkounts-1.json

@@ -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"
-}

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"
+}

clients/garage-10.json

@@ -1,4 +0,0 @@
-{
-  "name": "garage-10",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw2+3Wo+KkXVJCOX1SxT9\nSdwKXgPbCDM3EI9uwoxhMxQfRyN53dxIsBDsQUVOIe1Z8yqm4FenMQlNmeDR+QLE\nvNFf1fisinW+D9VVRm+CjcJy96i/Dyt786Z6YRrDlB860HxCbfTL2Zv5BRtbyIKg\nhz5gO+9PMEpPVR2ij9iue4K6jbM1AAL2ia/P6zDWLJqeIzUocCeHV5N0Z3jXH6qr\nf444v78x35MMJ+3tg5h95SU1/PDCpdSTct4uHEuKIosiN7p4DlYMoM5iSyvVoujr\nflRQPEpGzS9qEt3rDo/F4ltzYMx6bf1tB/0QaBKD+zwPZWTTwf61tSBo5/NkGvJc\nFQIDAQAB\n-----END PUBLIC KEY-----\n"
-}

clients/garage-14.json

@@ -0,0 +1,4 @@
+{
+  "name": "garage-14",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypINv1zTZ7+pyT0iRhik\n0W70ASYADo7qK7QyE9/3nu2sUrP1IjoNFsv/ceKwicH7Fw2Ei1o+yKZlKn7zJzY7\n93YRZndF04VH2bmqy0uOWK0Bdat7gCld5bvS6FmRflg7g64LFb33/64QIVsVGHGL\nYF2TO//x79t9JKcQDa4h5MOWzJNTFuEcUGa0gJjMYpWGVHEJSgRuIgyhXmyIJJgY\nguj6ymTm5+3VS7NzoNy2fbTt1LRpHb5UWrCR15oiLZiDSMLMx0CcGOCmrhvODi4k\n0umw+2NPd1G50s9z7KVbTqybuQ65se2amRnkVcNfaBIU5qk9bVqcmhZlEozmBZCd\ndwIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/garage-15.json

@@ -0,0 +1,4 @@
+{
+  "name": "garage-15",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy14sTt5gxVZi9C3KIEBu\nDyUgbb6jc3/GR22fNPTqV6uDHhxzhE2UsYwY/7yuA1RasdwHEOBWZaoC0Om5/Zmi\n8gn6//v1ILyLNaAcw+SQcxZkCN8Sk/0atRS9HYk1agE8Mvh72Fe2z3l+92VMefy7\nJwJUNNBTbnV2WVCchChoWnfhI7bkSLSHp0M2MO2pI+lkpSdmfkJSa5z9zihgxKO8\nXfvhryDCZNvfRVHhwc+ffpap0gLF0H9riGKE4FwLy4YqbuW1Tgm6bObb9bpOIw6Q\nVfH3kC/KMK5FlnxGmYtDkhRJ/wjGInRBk9WK/QOmjyd2FVxipEQmA4RdjlznRC9I\nrwIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/garage-16.json

@@ -0,0 +1,4 @@
+{
+  "name": "garage-16",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqYCUN4WNP05pjbxVJd1/\nvmDZU6XRrVVZS5piSSRzs+uxrcUQZew9oe8YwnB9Acf7nl1igS1Fa3e3TyVdrdrM\n+zKLIszJfZw8qH0BhUHYhIm5o+NXeUDR6zor5/4msq9yyXxMFM3FY6HSnz1IBY6P\n43GdArRqAhccGZTBzvowHZvVTkG553oYF1ETxlUWn+9l142YZufNK+B2JGUGSnf3\nS0A2vlQi7DGHBcUaPPqCLeaXB1cQ4Q6SqMvnExpi0xTdY2QXLlSIBJvJVowLtQKs\npS5qHxwCabMY/uHVoEKxgmMcGvjp4L0PoaXRcev5I2sDfbLuz1VxYfatjgI/1psg\ntwIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/garage-9.json

@@ -1,4 +0,0 @@
-{
-  "name": "garage-9",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnMHzKE8JBrsQkmRDeMjX\n71mBzvRzNM90cwA8xtvIkXesdTyGqohX9k/PJbCY5ySGK9PpMaYDPVAnwnUP8LFQ\n3G98aSbLxUjqU/PBzRsnWpihehr05uz9zYcNFzr4LTNvGQZsq47nN9Tk+LG3zHP7\nAZViv2mJ4ZRnukXf6KHlyoVvhuTu+tiBM8QzjTF97iP/aguNPzYHmrecy9Uf5bSA\nZrbNZT+ayxtgswC2OclhRucx7XLSuHXtpwFqsQzSAhiX1aQ3wwCyH9WJtVwpfUsE\nlxTjcQiSM9aPZ8iSC0shpBaKD1j3iF/2K2Jk+88++zMhJJPLermvaJxzsdePgvyk\nKQIDAQAB\n-----END PUBLIC KEY-----\n"
-}

clients/leo.json

@@ -0,0 +1,4 @@
+{
+  "name": "leo",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFfQsJnREjbXTtpT6BVt\naBaUzRmCQi8Du0TzeUG0ENrY0p5Exqleye2rC6bJlB3PER1xr5zdtuXLgbcVumIb\nzroU5JPtFbQk7r/pj0atT+UEYzl16iuEpprQ/bug+f0nE514USr6YG4G+tlZ/jBI\nSHsCQF1P8ufXFLW0ewC7rdvBkgA+DwK14naRxS4jO5MSl4wmNTjs/jymTg508mQq\nf5tG52t8qFdgn9pRdBXmyTpPtwK7I4rZ+1Qn+1E5m4oQUZsxh8Ba1bGbKotVO7Ua\nYL1yCGx7zRRUvLLIdSMvlRXTJBUSQtQ8P4QUDWTY1Na2w3t9sulKg2Lwsw8tktvC\nCwIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/postgres-10.json

@@ -0,0 +1,4 @@
+{
+  "name": "postgres-10",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2oBb5omC7ZionWhudgFm\n2NGcRXsI0c7+g1+0duaxj5dziaRTltqzpRJTfiJD6R36FcvEqwGc+qQgYSMzc1Xd\nY4OTvJFIDiFAmROm/DZYgFtTDldVNJZO2bbU3COYf/Z2Poq56gC4zLLd/zf6shgb\n2Mty8PlQ82JJAY9EMI3aAifdnZ1k/g4weFC4LFg9lUcNNXOwlAjp//LJ3ku3aY1r\nwW74msSeWEjE44YZdWyMYgM7Fy1hz5giHFQtRdOLemRCWQ8h26wn/cmWld7lsLg+\nlYqxokxWXGv8r5zR8kDTBkd0dxY7ZMbo7oESY4Uhuf4UReMe2ZGHto1E7w3llSj+\n7wIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/postgres-11.json

@@ -0,0 +1,4 @@
+{
+  "name": "postgres-11",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1foYpuubS2ovlg3uHO12\nQ/ROZ8MpG+LkCAM46uVfPaoWwfY0vdfMsBOanHDgm9DGUCEBJZ6LPrvCvGXbpPy6\n9GSswK75zVWODblNjvvV4ueGFq4bBFwRuZNjyMlqgyzeU+srZL0ivelu5XEuGuoD\nPYCBKWYqGMz85/eMC7/tinTJtKPyOtXe/G8meji+r7gh3j+ypj/EWeKfcRDa4aGe\n/DmMCurIjjPAXFLMAA6fIqPWVfcPw4APNPE60Z92yPGsTbPu7bL54M5f7udmmu7H\nOgk1HjMAmXCuLDzTkfaxqHP+57yELg/YpXR1E93VmBeQuIBsyOFEk6AmUmA1Ib6e\nnQIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/postgres-12.json

@@ -0,0 +1,4 @@
+{
+  "name": "postgres-12",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1mYGrYB8keUKmXA8dhWc\ncCLzp50xR0ajSw+bWYydyRqD5wuEVKjiJu4+G9QmTVXkVgJ+AYI0Y9/WZYpDqVH6\nvLUo6BSNQaWx20q93qIdOGLy8YG3Qyznezk4l8T9u9vWZDyDpKw6gCxzikMkrXxb\n0cqOYtyud8+PtSEEMogSjOKhRURVHlVrlVH3SQO7Whke9rkiFcbXzubsK9yjkUtF\nxZafSoGorOlDsPvFTfYnkepVB+GHcgiribRYSrO+73GypC2kqMhCpWrb6a0VWsP/\nh53+q3JL3vBvdvjcv51Wpf4n6JdnXnQGn2/MdXEzw+NXgjU4/IdYtbORSbaI8F5t\nowIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/postgres-7.json

@@ -1,4 +0,0 @@
-{
-  "name": "postgres-7",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArraIm6mXi0qgK4oWDs2I\nOIx+g/LPnfRd5aBXhoHcekGiJKttQTi5dRdN4+T6qVEC2h4Cc9qN47h2TZPLDh/M\neIZvu0AyicpectzXf6DtDZh0hFCnv47RDi9927op9tjMXk0SV1tLel7MN0dawATw\ny0vQkkr/5a3ZdiP4dFv+bdfVrj+Tuh85BYPVyX2mxq9F7Efxrt6rzVBiqr6uJLUY\nStpeB3CCalC4zQApKX2xrdtr2k8aJbqC6C//LiKbb7VKn+ZuZJ32L/+9HDEzQoFC\no0ZZPMhfnjcU+iSHYZuPMTJTNbwgRuOgpn9O8kZ239qYc59z7HEXwwWiYPDevbiM\nCQIDAQAB\n-----END PUBLIC KEY-----\n"
-}

clients/postgres-9.json

@@ -0,0 +1,4 @@
+{
+  "name": "postgres-9",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2dcE9HH0r5TBb/FGj2+e\nOw8ssoxeB61JmR4/psdZ6oPR08gxyqOY0ODziCmyIdXwFhjIcC44HjxCbcB8TU8G\nWGqlmfqWWIJW0x/2xOycHobAWDn5fC5ttTXkR3HC1TutX/2mH26mtfz9UjNdPaTo\nVZFMcxeaBCFSNlYC7hPUQ5f/qBdhhpLxP9uyzU+YFPqtwLP7g8EAUQObM4L+m6Q8\nqE7xgYpnhgaNrPsmvaVuoNylMGwyK0j1whOkcik8UgLprD70ISNSNxxcLehbvA3G\nPQPQRRuFF36fu2gECWGopbrFKwQGNfgJguQoXM1RQZQMQqWHPS933k5i6bi5pnhp\nzwIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/prometheus-1.json

@@ -0,0 +1,4 @@
+{
+  "name": "prometheus-1",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp7T/OBo/TZm3YqnN4+ok\nHwcJ0kW9w2rl9UfrOlWUvoPHBd2LrqpEv3Az3a150IylQ1H/UozmQA7DtjIoTA7d\nV3oLY970vYrYiURcojOo8qAZBy8EH7dfAHxuZryUeELr+3vdcHF5WrrfSt2FdFVX\nPTY95ikafAnOO0Nt8jvnlPoDn7REV8TOE6KOiUzcHKa2xGlfaIe0oRC21LD86uQm\nR09xY1YaJkVgZfeN/opoRjZawkU3FFs3jlUEVBF8k153oOw9W3bgsFFjSOtRtRRg\nDwyQ7oDeMH83kXnaCdpkNZd59wjzPcpxYAL4LRN52ZXA4Btr4DTi+GxHz98Dr0kU\nUQIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/rsk-testnet-5.json

@@ -1,4 +0,0 @@
-{
-  "name": "rsk-testnet-5",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/UHlgcSeh9Do7CTCKXC\n/4/aO2OvT+ijDVmrMYCNtE4sMeuFqKPnV1zxJZmRm4VNhkSQDkdWYD+6XvuFYW60\nyjB/N6D5lLlyjG4HD6fTkfh0K6f7t5mOYV7o4T59OoA3cBZuSROjtWmJ8jEFJ+k9\nII2kcyhPQcFN01ckzvZKRSPbVRccMoc+AKTjB3ZUfs/ERtlVoDrK4jEHluXOxUJO\nBKCcLonjJuLlpRLh7QfKrKFcR4idn5Ir43R6aSUesI/ipKwKsXnR3Bu7vXp74VF3\nMJ3EkdSBG+qJzy51fbRfQiUPAr/vSoVQZwW7FkIhIqqLkMaYCymn7qKfTGujoNU7\nlwIDAQAB\n-----END PUBLIC KEY-----\n"
-}

clients/rsk-testnet-6.json

@@ -0,0 +1,4 @@
+{
+  "name": "rsk-testnet-6",
+  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl1p4+F536/peA4XWMJtm\njggPl6yJb42V5bg3kDa8SHoIoQgXn59d3BclZ1Oz2+JhFd3Rrn4FN3Z1wzGpP+gA\nnxQOfgRG1ucahh7Nxaw3IdoHm7r/EdEOc9FrxvGJ+09YnmLfzn4iVQpsUiOiNVS7\n0LXtMXYtsjD+o6BTbOhGU8FMmGhMhQfXFVgoDdTiM/Q62zPw8Vtpa3yFpFJAu+dA\n+mm5h5W6FnaWJXM2arn3PxDOt+JQSWp5PYG4goU1FFreU9iFuoeGEfLy8unlbbXt\ne96QhNuCkOA15xqta0Z3oL7IlXWns7dLgZYlpZT9zaExIs3AEDaQcleacQPzXKSG\nswIDAQAB\n-----END PUBLIC KEY-----\n"
+}

clients/uploads-1.json

@@ -1,4 +0,0 @@
-{
-  "name": "uploads-1",
-  "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJwWaz8TeGv3SFlKzLMx\nqN8GTL/c0N9ppBvv8xNSS/yF9Y40SbL418uxYzm9hIhOXgIygIgLT2EKIXX32t+R\neOJCdYycQFM3At2fhMkjhuUW0gmDRcYBcBJLC5hLh2EZ+A8V7k4qgrBpPLOjEv48\nhQY0vuAw2DGndWr4QLh5NLUmQiOrfuzcZSSNCBOTIgUZgNmRd9QcCHDq4WDH3poa\nosJo4a9JGEGUL1irOivvEdyJPwEd2f++nYAdWwj8pjCYgpRshQlLhxOlylMx7MxB\nQt2bgJC9sahfbfJCOqdlCU3DMJL0bRUiuxK77WeSsxWBJmrsiF3+Ljs2Ix+s7fnS\nywIDAQAB\n-----END PUBLIC KEY-----\n"
-}

cookbooks/homebrew/.markdownlint-cli2.yaml

@@ -3,3 +3,5 @@ config:
   line-length: false # MD013
   no-duplicate-heading: false # MD024
   reference-links-images: false # MD052
+ignores:
+  - .github/copilot-instructions.md

cookbooks/homebrew/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 This file is used to list changes made in each version of the homebrew cookbook.
 
+## 6.0.2 - *2025-09-04*
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+## 6.0.1 - *2025-03-24*
+
+## 6.0.0 - *2025-03-17*
+
+- Updated library call for new homebrew class name found in chef-client 18.6.2+ releases
+
+## 5.4.9 - *2024-11-18*
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.8 - *2024-05-07*
+
+## 5.4.7 - *2024-05-06*
+
+- Explicitly include `Which` module from `Chef` which fixes runs on 18.x clients.
+
+## 5.4.6 - *2024-05-06*
+
+## 5.4.5 - *2023-11-01*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 5.4.4 - *2023-09-28*
+
+## 5.4.3 - *2023-09-04*
+
+## 5.4.2 - *2023-07-10*
+
 ## 5.4.1 - *2023-06-01*
 
 ## 5.4.0 - *2023-04-24*

cookbooks/homebrew/libraries/helpers.rb

@@ -20,8 +20,9 @@
 #
 
 class HomebrewUserWrapper
-  require 'chef/mixin/homebrew_user'
-  include Chef::Mixin::HomebrewUser
+  require 'chef/mixin/homebrew'
+  include Chef::Mixin::Homebrew
+  include Chef::Mixin::Which
 end
 
 module Homebrew
@@ -59,41 +60,17 @@ module Homebrew
 
   def owner
     @owner ||= begin
-      # once we only support 14.0 we can switch this to find_homebrew_username
-      require 'etc'
-      ::Etc.getpwuid(HomebrewUserWrapper.new.find_homebrew_uid).name
-               rescue Chef::Exceptions::CannotDetermineHomebrewOwner
-                 calculate_owner
-    end.tap do |owner|
-      Chef::Log.debug("Homebrew owner is #{owner}")
-    end
-  end
-
-  private
-
-  def calculate_owner
-    owner = homebrew_owner_attr || sudo_user || current_user
-    if owner == 'root'
-      raise Chef::Exceptions::User,
-           "Homebrew owner is 'root' which is not supported. " \
-           "To set an explicit owner, please set node['homebrew']['owner']."
-    end
-    owner
-  end
-
-  def homebrew_owner_attr
-    Chef.node['homebrew']['owner']
-  end
-
-  def sudo_user
-    ENV['SUDO_USER']
-  end
-
-  def current_user
-    ENV['USER']
+                 HomebrewUserWrapper.new.find_homebrew_username
+               rescue
+                 Chef::Exceptions::CannotDetermineHomebrewPath
+               end.tap do |owner|
+                 Chef::Log.debug("Homebrew owner is #{owner}")
+               end
   end
 end unless defined?(Homebrew)
 
 class HomebrewWrapper
   include Homebrew
 end
+
+Chef::Mixin::Homebrew.include(Homebrew)

cookbooks/homebrew/metadata.json

@@ -17,13 +17,13 @@
   "recipes": {
 
   },
-  "version": "5.4.1",
+  "version": "6.0.2",
   "source_url": "https://github.com/sous-chefs/homebrew",
   "issues_url": "https://github.com/sous-chefs/homebrew/issues",
   "privacy": false,
   "chef_versions": [
     [
-      ">= 15.3"
+      ">= 18.6.2"
     ]
   ],
   "ohai_versions": [

cookbooks/homebrew/metadata.rb

@@ -3,9 +3,9 @@ maintainer       'Sous Chefs'
 maintainer_email 'help@sous-chefs.org'
 license          'Apache-2.0'
 description      'Install Homebrew and includes resources for working with taps and casks'
-version          '5.4.1'
+version          '6.0.2'
 supports         'mac_os_x'
 
 source_url 'https://github.com/sous-chefs/homebrew'
 issues_url 'https://github.com/sous-chefs/homebrew/issues'
-chef_version '>= 15.3'
+chef_version '>= 18.6.2'

cookbooks/homebrew/renovate.json

@@ -1,9 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:base"],
-  "packageRules": [{
+  "packageRules": [
+    {
       "groupName": "Actions",
-      "matchUpdateTypes": ["patch", "pin", "digest"],
+      "matchUpdateTypes": ["minor", "patch", "pin"],
       "automerge": true,
       "addLabels": ["Release: Patch", "Skip: Announcements"]
     },

cookbooks/homebrew/resources/cask.rb

@@ -19,6 +19,7 @@
 # limitations under the License.
 #
 
+unified_mode true
 chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
 
 property :cask_name, String, regex: %r{^[\w/-]+$}, name_property: true

cookbooks/homebrew/resources/tap.rb

@@ -19,6 +19,7 @@
 # limitations under the License.
 #
 
+unified_mode true
 chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
 
 property :tap_name, String, name_property: true, regex: %r{^[\w-]+(?:\/[\w-]+)+$}

cookbooks/nodejs/.markdownlint-cli2.yaml

@@ -0,0 +1,12 @@
+config:
+  ul-indent: false # MD007
+  line-length: false # MD013
+  no-duplicate-heading: false # MD024
+  reference-links-images: false # MD052
+  ul-style:
+    style: asterisk
+  no-multiple-blanks:
+    maximum: 2
+ignores:
+  - .github/copilot-instructions.md
+  - .windsurf/**

cookbooks/nodejs/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "11.0.1"
+}

cookbooks/nodejs/CHANGELOG.md

@@ -1,221 +1,356 @@
 # NodeJS Cookbook Changelog
 
+Standardise files with files in sous-chefs/repo-management
+Standardise files with files in sous-chefs/repo-management
+Standardise files with files in sous-chefs/repo-management
+
+## [11.0.1](https://github.com/sous-chefs/nodejs/compare/v11.0.0...v11.0.1) (2026-07-09)
+
+
+### Bug Fixes
+
+* migrate to Policyfile ([#315](https://github.com/sous-chefs/nodejs/issues/315)) ([0a481e2](https://github.com/sous-chefs/nodejs/commit/0a481e22c2dcb811800219f96d24ba95bca583da))
+
+## [11.0.0](https://github.com/sous-chefs/nodejs/compare/v10.2.3...v11.0.0) (2026-05-19)
+
+
+### ⚠ BREAKING CHANGES
+
+* migrate nodejs to custom resources ([#306](https://github.com/sous-chefs/nodejs/issues/306))
+
+### Features
+
+* migrate nodejs to custom resources ([#306](https://github.com/sous-chefs/nodejs/issues/306)) ([a941d0f](https://github.com/sous-chefs/nodejs/commit/a941d0f729fad8b386cd8886ad9c232ed41b57e5))
+
+
+### Bug Fixes
+
+* **ci:** Update workflows to use release pipeline ([#300](https://github.com/sous-chefs/nodejs/issues/300)) ([ef16e2c](https://github.com/sous-chefs/nodejs/commit/ef16e2ce7d32be9d50822926a8d09e30d4a54bad))
+
+## [10.2.3](https://github.com/sous-chefs/nodejs/compare/10.2.2...v10.2.3) (2025-10-15)
+
+
+### Bug Fixes
+
+* **ci:** Update workflows to use release pipeline ([#300](https://github.com/sous-chefs/nodejs/issues/300)) ([ef16e2c](https://github.com/sous-chefs/nodejs/commit/ef16e2ce7d32be9d50822926a8d09e30d4a54bad))
+
+## 10.2.1 - *2025-06-08*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.2.0 - *2024-11-20*
+
+* Add support for new NodeSource repository (Thanks to @stissot)
+* Rework source install packages
+* Update SUSE packages
+
+## 10.1.22 - *2024-11-19*
+
+* Update default version to current LTS
+
+## 10.1.21 - *2024-11-19*
+
+* Update CI platforms
+
+## 10.1.20 - *2024-11-18*
+
+* Update test matrix check success of the integration stage
+
+## 10.1.19 - *2024-11-18*
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.16 - *2024-05-03*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.10 - *2023-04-07*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.7 - *2023-04-01*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.6 - *2023-03-20*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.5 - *2023-03-15*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.4 - *2023-02-20*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.2 - *2023-02-14*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.1 - *2022-12-08*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 10.1.0 - *2022-08-08*
+
+* To ensure consistent environment between `npm install` and `npm list`, pass same environment variables.
+
+## 10.0.1 - *2022-08-07*
+
+* Standardise files with files in sous-chefs/repo-management
+* Default to using EL 9 repo for Fedora
+* CI: Remove Fedora from source suite
+
+## 10.0.0 - *2022-04-21*
+
+* Update to NodeJS 17.x
+* Remove delivery and move to calling RSpec directly via a reusable workflow
+* Update tested platforms
+* Disable upstream DNF module on EL8 based systems
+
+## 9.0.2 - *2022-02-17*
+
+* Standardise files with files in sous-chefs/repo-management
+
+## 9.0.1 - *2022-02-08*
+
+* Remove delivery folder
+
+## 9.0.0 - *2021-09-13*
+
+* Update the default version to 14 LTS
+* Remove testing for EOL platforms
+* Add Debian 11 testing
+* Fix release version to use for Amazon Linux
+
+## 8.0.0 - *2021-09-02*
+
+* Update metadata and README to Sous Chef
+* Enable unified_mode by default and require at least Chef Infra Client 15.3
+* Cookstyle fixes
+
 ## 7.3.3 - *2021-08-30*
 
-- Standardise files with files in sous-chefs/repo-management
+* Standardise files with files in sous-chefs/repo-management
 
 ## 7.3.2 - *2021-06-01*
 
-- Standardise files with files in sous-chefs/repo-management
+* Standardise files with files in sous-chefs/repo-management
 
 ## 7.3.1 - *2020-12-31*
 
-- resolved cookstyle error: attributes/packages.rb:15:55 convention: `Layout/TrailingEmptyLines`
-- resolved cookstyle error: test/cookbooks/test/recipes/resource.rb:118:1 convention: `Layout/TrailingEmptyLines`
-- Enable builds for opensuse-leap-15
-- Add a library method test
+* resolved cookstyle error: attributes/packages.rb:15:55 convention: `Layout/TrailingEmptyLines`
+* resolved cookstyle error: test/cookbooks/test/recipes/resource.rb:118:1 convention: `Layout/TrailingEmptyLines`
+* Enable builds for opensuse-leap-15
+* Add a library method test
 
 ## 7.3.0 (2020-10-21)
 
-- Add rspec tests for the library methods
-- Update the url_invalid? method to return false if it detects an invalid uri
-- Add the auto_update option to the npm_package resource. Allows turning off auto_update of npm packages.
-- Allow actions and options for OS package installation to be specified as attributes
-- Add the live_stream parameter to the npm_package execution to get better installation diagnostics
-- Add the auto_update option to the npm_package resource. Allows turning off auto_update of npm packages.
-- Update testing
+* Add rspec tests for the library methods
+* Update the url_invalid? method to return false if it detects an invalid uri
+* Add the auto_update option to the npm_package resource. Allows turning off auto_update of npm packages.
+* Allow actions and options for OS package installation to be specified as attributes
+* Add the live_stream parameter to the npm_package execution to get better installation diagnostics
+* Add the auto_update option to the npm_package resource. Allows turning off auto_update of npm packages.
+* Update testing
 
 ## 7.2.0 (2020-10-07)
 
-- Verify the URI of installed packages to help determine if a good URI has been installed
-- Add tests that verify npm-package installed packages
-- Get the example test cookbook working
-- Add support for installing node on windows
+* Verify the URI of installed packages to help determine if a good URI has been installed
+* Add tests that verify npm-package installed packages
+* Get the example test cookbook working
+* Add support for installing node on windows
 
 ## 7.1.0 (2020-10-01)
 
-- resolved cookstyle error: recipes/nodejs_from_binary.rb:19:1 refactor: `ChefCorrectness/IncorrectLibraryInjection`
-- resolved cookstyle error: recipes/nodejs_from_source.rb:21:1 refactor: `ChefCorrectness/IncorrectLibraryInjection`
-- resolved cookstyle error: recipes/npm_from_source.rb:21:1 refactor: `ChefCorrectness/IncorrectLibraryInjection`
-- Have ark setup node and npm binaries into PATH
-- Add `node_env` to `npm_package` in order to set `NODE_ENV` (useful for some packages)
-- Include `npx` as a binary in addition to `npm`, it has been [included since `npm` v5.2.0](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b)
+* resolved cookstyle error: recipes/nodejs_from_binary.rb:19:1 refactor: `ChefCorrectness/IncorrectLibraryInjection`
+* resolved cookstyle error: recipes/nodejs_from_source.rb:21:1 refactor: `ChefCorrectness/IncorrectLibraryInjection`
+* resolved cookstyle error: recipes/npm_from_source.rb:21:1 refactor: `ChefCorrectness/IncorrectLibraryInjection`
+* Have ark setup node and npm binaries into PATH
+* Add `node_env` to `npm_package` in order to set `NODE_ENV` (useful for some packages)
+* Include `npx` as a binary in addition to `npm`, it has been [included since `npm` v5.2.0](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b)
 
 ## 7.0.1 (2020-06-04)
 
-- Minor readme fix
+* Minor readme fix
 
 ## 7.0.0 (2020-06-04)
 
-- Require Chef Infra Client 14+ and remove the build-essential dependency
-- Updated the default to Node.js v10.16.3
-- Added compatibility with Chef Infra Client 16.2+
-- Removed Foodcritic testing
-- Updated ChefSpec and Kitchen platforms
-- Resolved multiple minor cookstyle issues in the cookbook
-- Added a vscode editor config
+* Require Chef Infra Client 14+ and remove the build-essential dependency
+* Updated the default to Node.js v10.16.3
+* Added compatibility with Chef Infra Client 16.2+
+* Removed Foodcritic testing
+* Updated ChefSpec and Kitchen platforms
+* Resolved multiple minor cookstyle issues in the cookbook
+* Added a vscode editor config
 
 ## 6.0.0 (2018-10-11)
 
-- Use the build_essential resource in the source install recipe instead of the build-essential::default recipe. This way we can use the new built-in build_essential resource in Chef 14+
-- Set default version to Node.js v8.12.0
+* Use the build_essential resource in the source install recipe instead of the build-essential::default recipe. This way we can use the new built-in build_essential resource in Chef 14+
+* Set default version to Node.js v8.12.0
 
 ## 5.0.0 (2017-11-15)
 
-- nodejs_npm resource has been converted to a custom resource and renamed to npm_package. The existing resource name will continue to function, but over time code should be updated for the new name. This name change has been made so we can eventually merge this resource into the chef-client.
-- compat_resource cookbook dependency has been removed and this cookbook instead requires Chef 12.14 or later
-- Chef 13 compatibility has been resolved
-- The npm_package resource now properly installs packages when the 'package' property is setA
-- Speed up npm operations by only returning a list of the desired package instead of every npm package
-- Speed up source installation by using multipackage install for the dependencies
-- Remove the broken url_valid? helper which didn't work
+* nodejs_npm resource has been converted to a custom resource and renamed to npm_package. The existing resource name will continue to function, but over time code should be updated for the new name. This name change has been made so we can eventually merge this resource into the chef-client.
+* compat_resource cookbook dependency has been removed and this cookbook instead requires Chef 12.14 or later
+* Chef 13 compatibility has been resolved
+* The npm_package resource now properly installs packages when the 'package' property is setA
+* Speed up npm operations by only returning a list of the desired package instead of every npm package
+* Speed up source installation by using multipackage install for the dependencies
+* Remove the broken url_valid? helper which didn't work
 
 ## 4.0.0 (2017-07-11)
 
-- Updated the cookbook to require Chef 12.1+ and the compat_resource cookbook
-- Removed support for io.js which has merged back into the node.js project
-- Removed the dependency on homebrew, yum-epel, and apt cookbooks
-- Added node['nodejs']['manage_node'] attribute to use only cookbook's LWRP (required to manage node by nvm)
-- Updated the default repository URLs to be the 6.X repos
-- Added initial support for Suse and Amazon Linux
-- Improved architecture detection to support aarch64
-- Improved readme with examples for fetching your own binaries
-- Added installation of openssl and xz utilities that are needed for the binary install recipe
-- Updated the cookbook license string to be an SPDX compliant string
-- Set the minimum version of the ark cookbook to 2.0.2 in order to support Suse
-- Updated the default version from 6.9.1 to 6.10.2
-- Switched to Delivery local mode for testing
-- Added Integration testing in Travis CI with kitchen-dokken and ChefDK
+* Updated the cookbook to require Chef 12.1+ and the compat_resource cookbook
+* Removed support for io.js which has merged back into the node.js project
+* Removed the dependency on homebrew, yum-epel, and apt cookbooks
+* Added node['nodejs']['manage_node'] attribute to use only cookbook's LWRP (required to manage node by nvm)
+* Updated the default repository URLs to be the 6.X repos
+* Added initial support for Suse and Amazon Linux
+* Improved architecture detection to support aarch64
+* Improved readme with examples for fetching your own binaries
+* Added installation of openssl and xz utilities that are needed for the binary install recipe
+* Updated the cookbook license string to be an SPDX compliant string
+* Set the minimum version of the ark cookbook to 2.0.2 in order to support Suse
+* Updated the default version from 6.9.1 to 6.10.2
+* Switched to Delivery local mode for testing
+* Added Integration testing in Travis CI with kitchen-dokken and ChefDK
 
 ## 3.0.0 (2016-11-02)
 
-- Updated the default release to the nodejs 6.9.1\. This requires C++11 extensions to compile, which are only present in GCC 4.8+. Due to this RHEL 5/6 and Ubuntu 12.04 are not supported if using this version.
-- Switched the download URLs to the .xz packages since the .tar.gz packages are no longer being created
-- Improvements to the readme examples and requirements sections
-- Removed installation of apt-transport-https and instead rely on an apt cookbook that will do the same
-- Fixed the ChefSpec matchers
-- Added Scientific, Oracle, and Amazon as supported distros in the metadata
-- Added chef_version metadata
-- Removed conflicts and suggests metadata which aren't implemented or recommended for use
-- Removed Chef 10 compatibility code
-- Switched Integration testing to Inspec from bats
-- Added the Apache 2.0 license file to the repo
-- Expanded Test Kitchen testing
-- Switched from Rubocop to Cookstyle and resolved all warnings
-- Switched Travis to testing using ChefDK
+* Updated the default release to the nodejs 6.9.1\. This requires C++11 extensions to compile, which are only present in GCC 4.8+. Due to this RHEL 5/6 and Ubuntu 12.04 are not supported if using this version.
+* Switched the download URLs to the .xz packages since the .tar.gz packages are no longer being created
+* Improvements to the readme examples and requirements sections
+* Removed installation of apt-transport-https and instead rely on an apt cookbook that will do the same
+* Fixed the ChefSpec matchers
+* Added Scientific, Oracle, and Amazon as supported distros in the metadata
+* Added chef_version metadata
+* Removed conflicts and suggests metadata which aren't implemented or recommended for use
+* Removed Chef 10 compatibility code
+* Switched Integration testing to Inspec from bats
+* Added the Apache 2.0 license file to the repo
+* Expanded Test Kitchen testing
+* Switched from Rubocop to Cookstyle and resolved all warnings
+* Switched Travis to testing using ChefDK
 
 ## 2.4.4
 
-- Use HTTPS prefix URLs for node download #98
-- Update NPM symlink when installing from source #105
-- Add support for NPM private modules #107
+* Use HTTPS prefix URLs for node download #98
+* Update NPM symlink when installing from source #105
+* Add support for NPM private modules #107
 
 ## v2.4.2
 
-- Fix check version
-- Support iojs package install
+* Fix check version
+* Support iojs package install
 
 ## v2.4.0
 
-- Move `npm_packages` to his own recipe
-- Fix different race conditions when using direct recipe call
-- Fix npm recipe
+* Move `npm_packages` to his own recipe
+* Fix different race conditions when using direct recipe call
+* Fix npm recipe
 
 ## v2.3.2
 
-- Fix package recipe
+* Fix package recipe
 
 ## v2.3.0
 
-- Support io.js. Use node['nodejs']['engine'].
-- Add MacOS support via homebrew
+* Support io.js. Use node['nodejs']['engine'].
+* Add MacOS support via homebrew
 
 ## v2.2.0
 
-- Add node['nodejs']['keyserver']
-- Update arm checksum
-- Fix `npm_packages` JSON
+* Add node['nodejs']['keyserver']
+* Update arm checksum
+* Fix `npm_packages` JSON
 
 ## v2.1.0
 
-- Use official nodesource repository
-- Add node['nodejs']['npm_packages'] to install npm package with `default` recipe
+* Use official nodesource repository
+* Add node['nodejs']['npm_packages'] to install npm package with `default` recipe
 
 ## v2.0.0
 
-- Travis integration
-- Gems updated
-- Rewrite cookbook dependencies
-- Added complete test-kitchen integration : Rake, rubocop, foodcritic, vagrant, bats testing ...
-- Added NodeJS `install_method` option (sources, bins or packages)
-- Added NPM `install_method` option (sources or packages)
-- NPM version can now be chosen independently from nodejs' embedded version
-- Added a `nodejs_npm` LWRP to manage, install and resolve NPM packages
+* Travis integration
+* Gems updated
+* Rewrite cookbook dependencies
+* Added complete test-kitchen integration : Rake, rubocop, foodcritic, vagrant, bats testing ...
+* Added NodeJS `install_method` option (sources, bins or packages)
+* Added NPM `install_method` option (sources or packages)
+* NPM version can now be chosen independently from nodejs' embedded version
+* Added a `nodejs_npm` LWRP to manage, install and resolve NPM packages
 
 ## v1.3.0
 
-- update default versions to the latest: node - v0.10.15 and npm - v1.3.5
-- default to package installation of nodejs on smartos ([@wanelo-pair])
-- Add Raspberry pi support ([@robertkowalski])
+* update default versions to the latest: node - v0.10.15 and npm - v1.3.5
+* default to package installation of nodejs on smartos ([@wanelo-pair])
+* Add Raspberry pi support ([@robertkowalski])
 
 ## v1.2.0
 
-- implement installation from package on RedHat - ([@vaskas])
+* implement installation from package on RedHat - ([@vaskas])
 
 ## v1.1.3
 
-- update default version of node to 0.10.13 - and npm - v1.3.4 ([@jodosha][])
+* update default version of node to 0.10.13 - and npm - v1.3.4 ([@jodosha][])
 
 ## v1.1.2
 
-- update default version of node to 0.10.2 - ([@bakins])
-- fully migrated to test-kitchen 1.alpha and vagrant 1.1.x/berkshelf 1.3.1
+* update default version of node to 0.10.2 - ([@bakins])
+* fully migrated to test-kitchen 1.alpha and vagrant 1.1.x/berkshelf 1.3.1
 
 ## v1.1.1
 
-- update default versions to the latest: node - v0.10.0 and npm - v1.2.14
-- `make_thread` is now a real attribute - ([@ChrisLundquist])
+* update default versions to the latest: node - v0.10.0 and npm - v1.2.14
+* `make_thread` is now a real attribute - ([@ChrisLundquist])
 
 ## v1.1.0
 
-- rewrite the package install; remove rpm support since there are no longer any packages available anywhere
-- add support to install `legacy_packages` from ubuntu repo as well as the latest 0.10.x branch (this is default).
+* rewrite the package install; remove rpm support since there are no longer any packages available anywhere
+* add support to install `legacy_packages` from ubuntu repo as well as the latest 0.10.x branch (this is default).
 
 ## v1.0.4
 
-- add support for binary installation method ([@JulesAU])
+* add support for binary installation method ([@JulesAU])
 
 ## v1.0.3
 
-- 7.3.1 - *2020-12-31*
+* 7.3.1 - *2020-12-31*
 
 ## v1.0.2
 
-- add smartos support for package install ([@sax])
-- support to compile with all processors available (default 2 if unknown) - ([@ChrisLundquist])
-- moved to `platform_family` syntax
-- ensure npm recipe honours the 'source' or 'package' setting - ([@markbirbeck])
-- updated the default versions to the latest stable node/npm
+* add smartos support for package install ([@sax])
+* support to compile with all processors available (default 2 if unknown) - ([@ChrisLundquist])
+* moved to `platform_family` syntax
+* ensure npm recipe honours the 'source' or 'package' setting - ([@markbirbeck])
+* updated the default versions to the latest stable node/npm
 
 ## v1.0.1
 
-- fixed bug that prevented overwritting the node/npm versions (moved the `src_url`s as local variables instead of attributes) - ([@johannesbecker])
-- updated the default versions to the latest node/npm
+* fixed bug that prevented overwritting the node/npm versions (moved the `src_url`s as local variables instead of attributes) - ([@johannesbecker])
+* updated the default versions to the latest node/npm
 
 ## v1.0.0
 
-- added packages installation support ([@smith])
+* added packages installation support ([@smith])
 
-[@bakins]: https://github.com/bakins
-[@chrislundquist]: https://github.com/ChrisLundquist
-[@gmccue]: https://github.com/gmccue
-[@johannesbecker]: https://github.com/johannesbecker
-[@julesau]: https://github.com/JulesAU
-[@markbirbeck]: https://github.com/markbirbeck
-[@predominant]: https://github.com/predominant
-[@robertkowalski]: https://github.com/robertkowalski
-[@sax]: https://github.com/sax
-[@sjlu]: https://github.com/sjlu
-[@smith]: https://github.com/smith
-[@vaskas]: https://github.com/vaskas
-[@wanelo-pair]: https://github.com/wanelo-pair
+[@bakins]: <https://github.com/bakins>
+[@chrislundquist]: <https://github.com/ChrisLundquist>
+[@johannesbecker]: <https://github.com/johannesbecker>
+[@julesau]: <https://github.com/JulesAU>
+[@markbirbeck]: <https://github.com/markbirbeck>
+[@robertkowalski]: <https://github.com/robertkowalski>
+[@sax]: <https://github.com/sax>
+[@smith]: <https://github.com/smith>
+[@vaskas]: <https://github.com/vaskas>
+[@wanelo-pair]: <https://github.com/wanelo-pair>

cookbooks/nodejs/LIMITATIONS.md

@@ -0,0 +1,69 @@
+# Limitations
+
+This cookbook defaults to Node.js 24 LTS, using Node.js v24.15.0 checksums from the official `SHASUMS256.txt` published for `latest-v24.x` on 2026-04-16.
+
+Sources checked on 2026-04-29:
+
+* Node.js release schedule: <https://github.com/nodejs/Release/blob/main/schedule.json>
+* Node.js latest v24 artifacts: <https://nodejs.org/dist/latest-v24.x/>
+* Node.js v24 checksums: <https://nodejs.org/dist/latest-v24.x/SHASUMS256.txt>
+* NodeSource distributions page: <https://nodesource.com/products/distributions>
+* NodeSource distributions repository: <https://github.com/nodesource/distributions>
+
+## Package Availability
+
+### APT (Debian/Ubuntu)
+
+NodeSource documents Node 24 packages for:
+
+* Ubuntu 20.04, 22.04, 24.04: `amd64`, `armhf`, `arm64`
+* Debian 10, 11, 12: `amd64`, `armhf`, `arm64`
+
+The cookbook only declares currently supported, non-EOL Debian/Ubuntu platforms in `metadata.rb`: Debian 12 or later and Ubuntu 22.04 or later. NodeSource packages use the `nodistro` repository distribution.
+
+### DNF/YUM (RHEL family)
+
+NodeSource documents RPM packages for RHEL 8/9, Fedora 29+, and Amazon Linux 2023 on `x86_64` and `arm64`. The repository URL pattern used by this cookbook is:
+
+```text
+<https://rpm.nodesource.com/pub_<major>>.x/nodistro/nodejs/$basearch
+```
+
+The cookbook declares AlmaLinux, Amazon Linux 2023, CentOS Stream, Fedora, Oracle Linux, Red Hat, and Rocky Linux where current test images are available.
+
+### Zypper (SUSE)
+
+NodeSource does not publish SUSE repository rows in the current distributions documentation. This migration does not declare SUSE/openSUSE support in `metadata.rb`.
+
+### Windows and macOS
+
+Windows support is limited to `nodejs_install` with `install_method 'chocolatey'`. macOS support is limited to package installation through the platform package provider where available. Dokken coverage is Linux-only.
+
+## Architecture Limitations
+
+Official Node.js v24.15.0 source and binary checksums pinned by this cookbook:
+
+| Artifact                           | SHA256                                                             |
+| ---------------------------------- | ------------------------------------------------------------------ |
+| `node-v24.15.0.tar.gz`             | `729de494dd2872e5a3a6c32a1cd156a5413d4aca2772b2d873ee86bb5531bcd9` |
+| `node-v24.15.0-linux-x64.tar.gz`   | `44836872d9aec49f1e6b52a9a922872db9a2b02d235a616a5681b6a85fec8d89` |
+| `node-v24.15.0-linux-arm64.tar.gz` | `73afc234d558c24919875f51c2d1ea002a2ada4ea6f83601a383869fefa64eed` |
+
+The `nodejs_install` binary action currently models Linux `x64` and `arm64` checksums. Other official Node.js artifacts can be installed by passing `binary_url` and the matching checksum.
+
+## Source/Compiled Installation
+
+### Build Dependencies
+
+| Platform Family    | Packages                                             |
+| ------------------ | ---------------------------------------------------- |
+| Debian             | `build-essential`, `libssl-dev`, `python3`           |
+| RHEL/Fedora/Amazon | `build-essential`, `openssl-devel`, `python3`, `tar` |
+| Other              | `build-essential`, `python3`                         |
+
+Source builds are much slower than package or binary installs and are not used as the default Kitchen smoke path.
+
+## Known Issues
+
+* Node.js 20 reaches end-of-life on 2026-04-30, so this migration does not keep old Node 20 defaults.
+* NodeSource repository docs currently show some LTS/current labels that lag the official Node.js release schedule. The cookbook version defaults follow the official Node.js release schedule and official Node.js checksum artifacts.

cookbooks/nodejs/Policyfile.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+name 'nodejs'
+
+default_source :supermarket
+
+run_list 'recipe[test::default]'
+
+cookbook 'nodejs', path: '.'
+cookbook 'test', path: './test/cookbooks/test'
+
+Dir.children('./test/cookbooks/test/recipes').grep(/\.rb\z/).sort.each do |recipe|
+  recipe_name = File.basename(recipe, '.rb')
+
+  named_run_list recipe_name.to_sym, "recipe[test::#{recipe_name}]"
+end

cookbooks/nodejs/README.md

@@ -1,220 +1,109 @@
 # [nodejs-cookbook](https://github.com/redguide/nodejs)
 
-[![CK Version](http://img.shields.io/cookbook/v/nodejs.svg?branch=master)](https://supermarket.chef.io/cookbooks/nodejs) [![Build Status](https://img.shields.io/travis/redguide/nodejs.svg)](https://travis-ci.org/redguide/nodejs)
+[![Cookbook Version](https://img.shields.io/cookbook/v/nodejs.svg)](https://supermarket.chef.io/cookbooks/nodejs)
+[![CI State](https://github.com/sous-chefs/nodejs/workflows/ci/badge.svg)](https://github.com/sous-chefs/nodejs/actions?query=workflow%3Aci)
+[![OpenCollective](https://opencollective.com/sous-chefs/backers/badge.svg)](#backers)
+[![OpenCollective](https://opencollective.com/sous-chefs/sponsors/badge.svg)](#sponsors)
+[![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0)
 
-Installs node.js/npm and includes a resource for managing npm packages
+Provides custom resources for installing Node.js/npm and managing npm packages.
+
+## Maintainers
+
+This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of Chef cookbook maintainers working together to maintain important cookbooks. If you’d like to know more please visit [sous-chefs.org](https://sous-chefs.org/) or come chat with us on the Chef Community Slack in [#sous-chefs](https://chefcommunity.slack.com/messages/C2V7B88SF).
 
 ## Requirements
 
 ### Platforms
 
-- Debian/Ubuntu
-- RHEL/CentOS/Scientific/Amazon/Oracle
-- openSUSE
-- Windows
-
-Note: Source installs require GCC 4.8+, which is not included on older distro releases
+* Debian/Ubuntu
+* RHEL family/Fedora/Amazon Linux
+* macOS where platform packages are available
+* Windows through Chocolatey
 
 ### Chef
 
-- Chef Infra Client 14+
+* Chef Infra Client 15.3+
 
 ### Cookbooks
 
-- ark
+* ark
+* chocolatey
 
 ## Usage
 
-Include the nodejs recipe to install node on your system based on the default installation method:
+Install Node.js with the default platform method:
 
 ```ruby
-include_recipe "nodejs"
+nodejs_install 'nodejs'
 ```
 
-### Install methods
-
-#### Package
-
 Install node from packages:
 
 ```ruby
-node['nodejs']['install_method'] = 'package' # Not necessary because it's the default
-include_recipe "nodejs"
-# Or
-include_recipe "nodejs::nodejs_from_package"
+nodejs_install 'nodejs' do
+  install_method 'package'
+  version '24.15.0'
 ```
 
-By default this will setup deb/rpm repositories from nodesource.com, which include up to date NodeJS packages. If you prefer to use distro provided package you can disable this behavior by setting `node['nodejs']['install_repo']` to `false`.
-
-#### Binary
-
-Install node from official prebuilt binaries:
+Install Node.js from official prebuilt binaries:
 
 ```ruby
-node['nodejs']['install_method'] = 'binary'
-include_recipe "nodejs"
-
-# Or
-include_recipe "nodejs::nodejs_from_binary"
-
-# Or set a specific version of nodejs to be installed
-node.default['nodejs']['install_method'] = 'binary'
-node.default['nodejs']['version'] = '5.9.0'
-node.default['nodejs']['binary']['checksum'] = '99c4136cf61761fac5ac57f80544140a3793b63e00a65d4a0e528c9db328bf40'
-
-# Or fetch the binary from your own location
-node.default['nodejs']['install_method'] = 'binary'
-node.default['nodejs']['binary']['url'] = 'https://s3.amazonaws.com/my-bucket/node-v7.8.0-linux-x64.tar.gz'
-node.default['nodejs']['binary']['checksum'] = '0bd86f2a39221b532172c7d1acb57f0b0cba88c7b82ea74ba9d1208b9f6f9697'
+nodejs_install 'nodejs' do
+  install_method 'binary'
 ```
 
-#### Source
-
-Install node from sources:
+Install Node.js from source:
 
 ```ruby
-node['nodejs']['install_method'] = 'source'
-include_recipe "nodejs"
-# Or
-include_recipe "nodejs::nodejs_from_source"
+nodejs_install 'nodejs' do
+  install_method 'source'
+end
 ```
 
-#### Chocolatey
-
-Install node from chocolatey:
-
-```chef
-node['nodejs']['install_method'] = 'chocolatey'
-include_recipe "nodejs"
-# Or
-include_recipe "nodejs::nodejs_from_chocolatey"
-```
-
-## NPM
-
-Npm is included in nodejs installs by default. By default, we are using it and call it `embedded`. Adding recipe `nodejs::npm` assure you to have npm installed and let you choose install method with `node['nodejs']['npm']['install_method']`
-
-```ruby
-include_recipe "nodejs::npm"
-```
-
-_Warning:_ This recipe will include the `nodejs` recipe, which by default includes `nodejs::nodejs_from_package` if you did not set `node['nodejs']['install_method']`.
-
-## Resources
-
-### npm_package
-
-note: This resource was previously named nodejs_npm. Calls to that resource name will still function, but cookbooks should be updated for the new npm_package resource name.
-
-`npm_package` lets you install npm packages from various sources:
-
-- npm registry:
-
-  - name: `property :package`
-  - version: `property :version` (optional)
-
-- url: `property :url`
-
-  - for git use `git://{your_repo}`
-
-- from a json (package.json by default): `property :json`
-
-  - use `true` for default
-  - use a `String` to specify json file
-
-Packages can be installed globally (by default) or in a directory (by using `attribute :path`)
-
-You can specify an `NPM_TOKEN` environment variable for accessing [NPM private modules](https://docs.npmjs.com/private-modules/intro) by using `attribute :npm_token`
-
-You can specify a `NODE_ENV` environment variable, in the case that some element of your installation depends on this by using `attribute :node_env`. E.g., using [`node-config`](https://www.npmjs.com/package/config) as part of your postinstall script. Please note that adding the `--production` option will override this to `NODE_ENV=production`.
-
-You can append more specific options to npm command with `attribute :options` array :
-
-You can specify auto_update as false to stop the npm install command from running and updating an installed package. Running the command will update packages within restrictions imposed by a package.json file. The default behavior is to update automatically.
-
-- use an array of options (w/ dash), they will be added to npm call.
-- ex: `['--production','--force']` or `['--force-latest']`
-
-You can specify live_stream true for the resource to have the package install information included in the chef-client log outout for better npm package diagnostics and trouble shooting.
-
-This LWRP attempts to use vanilla npm as much as possible (no custom wrapper).
-
-### Packages
+Install npm packages:
 
 ```ruby
 npm_package 'express'
 
-npm_package 'async' do
-  version '0.6.2'
-end
-
-npm_package 'request' do
-  url 'github mikeal/request'
-end
-
-npm_package 'grunt' do
-  path '/home/random/grunt'
-  json true
-  user 'random'
-  node_env 'staging'
-end
-
-npm_package 'my_private_module' do
-  path '/home/random/myproject' # The root path to your project, containing a package.json file
-  json true
-  npm_token '12345-abcde-e5d4c3b2a1'
-  user 'random'
-  options ['--production'] # Only install dependencies. Skip devDependencies
-end
-```
-
-[Working Examples](test/cookbooks/nodejs_test/recipes/npm.rb)
-
-Or add packages via attributes (which accept the same attributes as the LWRP above):
-
-```json
-"nodejs": {
-  "npm_packages": [
-    {
-      "name": "express"
-    },
-    {
-      "name": "async",
-      "version": "0.6.2"
-    },
-    {
-      "name": "request",
-      "url": "github mikeal/request"
-    }
-    {
-      "name": "grunt",
-      "path": "/home/random/grunt",
-      "json": true,
-      "user": "random"
-    }
+nodejs_npm_packages 'application packages' do
+  packages [
+    { name: 'socket.io', version: '4.8.1' },
   ]
-}
+end
 ```
 
-## License & Authors
+See [migration.md](migration.md) for the breaking recipe/attribute migration guide.
 
-**Author:** Marius Ducea (marius@promethost.com)
-**Author:** Nathan L Smith (nlloyds@gmail.com)
-**Author:** Guilhem Lettron (guilhem@lettron.fr)
-**Author:** Barthelemy Vessemont (bvessemont@gmail.com)
+## Resources
 
-**Copyright:** Chef Software, Inc.
+* [nodejs_install](documentation/nodejs_install.md)
+* [nodejs_repository](documentation/nodejs_repository.md)
+* [nodejs_npm_install](documentation/nodejs_npm_install.md)
+* [nodejs_npm_packages](documentation/nodejs_npm_packages.md)
+* [npm_package](documentation/nodejs_npm_package.md)
 
-```
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+## Contributors
 
-    http://www.apache.org/licenses/LICENSE-2.0
+This project exists thanks to all the people who [contribute.](https://opencollective.com/sous-chefs/contributors.svg?width=890&button=false)
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```
+### Backers
+
+Thank you to all our backers!
+
+![<https://opencollective.com/sous-chefs#backers](https://opencollective.com/sous-chefs/backers.svg?width=600&avatarHeight=40>)
+
+### Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website.
+
+![<https://opencollective.com/sous-chefs/sponsor/0/website](https://opencollective.com/sous-chefs/sponsor/0/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/1/website](https://opencollective.com/sous-chefs/sponsor/1/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/2/website](https://opencollective.com/sous-chefs/sponsor/2/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/3/website](https://opencollective.com/sous-chefs/sponsor/3/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/4/website](https://opencollective.com/sous-chefs/sponsor/4/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/5/website](https://opencollective.com/sous-chefs/sponsor/5/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/6/website](https://opencollective.com/sous-chefs/sponsor/6/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/7/website](https://opencollective.com/sous-chefs/sponsor/7/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/8/website](https://opencollective.com/sous-chefs/sponsor/8/avatar.svg?avatarHeight=100>)
+![<https://opencollective.com/sous-chefs/sponsor/9/website](https://opencollective.com/sous-chefs/sponsor/9/avatar.svg?avatarHeight=100>)

cookbooks/nodejs/attributes/default.rb

@@ -1,44 +0,0 @@
-#
-# Cookbook:: nodejs
-# Attributes:: nodejs
-#
-# Copyright:: 2010-2017, Promet Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-case node['platform_family']
-when 'smartos', 'rhel', 'debian', 'fedora', 'mac_os_x', 'suse', 'amazon'
-  default['nodejs']['install_method'] = 'package'
-when 'windows'
-  default['nodejs']['install_method'] = 'chocolatey'
-else
-  default['nodejs']['install_method'] = 'source'
-end
-
-default['nodejs']['version'] = '10.16.3'
-
-default['nodejs']['prefix_url']['node'] = 'https://nodejs.org/dist/'
-
-default['nodejs']['tmpdir'] = '/tmp'
-default['nodejs']['source']['url']      = nil # Auto generated
-default['nodejs']['source']['checksum'] = 'db5a5e03a815b84a1266a4b48bb6a6d887175705f84fd2472f0d28e5e305a1f8'
-
-default['nodejs']['binary']['url'] = nil # Auto generated
-default['nodejs']['binary']['checksum']['linux_x64'] = '2f0397bb81c1d0c9901b9aff82a933257bf60f3992227b86107111a75b9030d9'
-default['nodejs']['binary']['checksum']['linux_arm64'] = '3bab16e7107092e43426e082ee9fd88ef0a43a35816f662f14563bcc5152600d'
-default['nodejs']['binary']['append_env_path'] = true
-
-default['nodejs']['make_threads'] = node['cpu'] ? node['cpu']['total'].to_i : 2
-
-default['nodejs']['manage_node'] = true

cookbooks/nodejs/attributes/npm.rb

@@ -1,2 +0,0 @@
-default['nodejs']['npm']['install_method'] = 'embedded'
-default['nodejs']['npm']['version'] = 'latest'

cookbooks/nodejs/attributes/packages.rb

@@ -1,15 +0,0 @@
-include_attribute 'nodejs::default'
-include_attribute 'nodejs::repo'
-
-default['nodejs']['packages'] = value_for_platform_family(
-  'debian' => node['nodejs']['install_repo'] ? ['nodejs'] : %w(nodejs npm nodejs-dev),
-  %w(rhel fedora amazon) => node['nodejs']['install_repo'] ? %w(nodejs nodejs-devel) : %w(nodejs npm nodejs-dev),
-  'suse' => node['platform_version'].to_i < 42 ? %w(nodejs10 npm10 nodejs10-devel) : %w(nodejs4 npm4 nodejs4-devel),
-  'mac_os_x' => ['node'],
-  'freebsd' => %w(node npm),
-  'default' => ['nodejs']
-)
-
-# Add options and actions by package name
-default['nodejs']['package_action'] = { default: :install }
-default['nodejs']['package_options'] = { default: '' }

cookbooks/nodejs/attributes/repo.rb

@@ -1,12 +0,0 @@
-case node['platform_family']
-when 'debian'
-  default['nodejs']['install_repo'] = true
-  default['nodejs']['repo']         = 'https://deb.nodesource.com/node_10.x'
-  default['nodejs']['keyserver']    = 'keyserver.ubuntu.com'
-  default['nodejs']['key']          = '1655a0ab68576280'
-when 'rhel', 'fedora', 'amazon'
-  default['nodejs']['install_repo'] = true
-  release_ver = platform?('amazon') ? 6 : node['platform_version'].to_i
-  default['nodejs']['repo']         = "https://rpm.nodesource.com/pub_10.x/el/#{release_ver}/$basearch"
-  default['nodejs']['key']          = 'https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL'
-end

cookbooks/nodejs/chefignore

@@ -61,7 +61,7 @@ Dangerfile
 examples/*
 features/*
 Guardfile
-kitchen.yml*
+kitchen*.yml
 mlc_config.json
 Procfile
 Rakefile
@@ -83,10 +83,8 @@ test/*
 */.hg/*
 */.svn/*
 
-# Berkshelf #
-#############
-Berksfile
-Berksfile.lock
+# Dependency cache #
+####################
 cookbooks/*
 tmp
 
@@ -98,7 +96,6 @@ Gemfile.lock
 
 # Policyfile #
 ##############
-Policyfile.rb
 Policyfile.lock.json
 
 # Documentation #

cookbooks/nodejs/kitchen.dokken.yml

@@ -1,88 +0,0 @@
----
-driver:
-  name: dokken
-  privileged: true  # because Docker and SystemD
-  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
-  chef_license: accept-no-persist
-
-transport:
-  name: dokken
-
-provisioner:
-  name: dokken
-  deprecations_as_errors: true
-
-verifier:
-  name: inspec
-
-platforms:
-  - name: amazonlinux
-    driver:
-      image: dokken/amazonlinux
-      pid_one_command: /sbin/init
-
-  - name: amazonlinux-2
-    driver:
-      image: dokken/amazonlinux-2
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: debian-8
-    driver:
-      image: dokken/debian-8
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: debian-9
-    driver:
-      image: dokken/debian-9
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: debian-10
-    driver:
-      image: dokken/debian-10
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: centos-7
-    driver:
-      image: dokken/centos-7
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: centos-8
-    driver:
-      image: dokken/centos-8
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: fedora-latest
-    driver:
-      image: dokken/fedora-latest
-      pid_one_command: /usr/lib/systemd/systemd
-
-  - name: opensuse-leap-15
-    driver:
-      image: dokken/opensuse-leap-15
-      pid_one_command: /bin/systemd
-
-  - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-
-  - name: ubuntu-20.04
-    driver:
-      image: dokken/ubuntu-20.04
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install python -y
-
-  - name: opensuse-leap-15
-    driver:
-      image: dokken/opensuse-leap-15
-      pid_one_command: /bin/systemd

cookbooks/nodejs/libraries/nodejs_helper.rb

@@ -1,19 +1,96 @@
+# frozen_string_literal: true
+
 module NodeJs
   module Helper
-    def npm_dist
-      if node['nodejs']['npm']['url']
-        { 'url' => node['nodejs']['npm']['url'] }
+    def default_install_method
+      case node['platform_family']
+      when 'debian', 'rhel', 'fedora', 'amazon', 'mac_os_x', 'suse'
+        'package'
+      when 'windows'
+        'chocolatey'
       else
-
-        require 'open-uri'
-        require 'json'
-        result = JSON.parse(URI.parse("https://registry.npmjs.org/npm/#{node['nodejs']['npm']['version']}").read, max_nesting: false)
-        ret = { 'url' => result['dist']['tarball'], 'version' => result['_npmVersion'], 'shasum' => result['dist']['shasum'] }
-        Chef::Log.debug("Npm dist #{ret}")
-        ret
+        'source'
       end
     end
 
+    def default_packages(install_repository)
+      case node['platform_family']
+      when 'debian'
+        install_repository ? ['nodejs'] : %w(nodejs npm nodejs-dev)
+      when 'rhel', 'fedora', 'amazon'
+        install_repository ? %w(nodejs nodejs-devel) : %w(nodejs npm nodejs-devel)
+      when 'suse'
+        %w(nodejs npm nodejs-devel)
+      when 'mac_os_x'
+        ['node']
+      else
+        ['nodejs']
+      end
+    end
+
+    def default_build_packages
+      case node['platform_family']
+      when 'rhel', 'fedora', 'amazon'
+        %w(openssl-devel python3 tar)
+      when 'debian'
+        %w(libssl-dev python3)
+      else
+        %w(python3)
+      end
+    end
+
+    def dnf_python_package?(package_name)
+      package_name == 'python3' && platform_family?('rhel', 'fedora', 'amazon')
+    end
+
+    def default_make_threads
+      node['cpu'] ? node['cpu']['total'].to_i : 2
+    end
+
+    def node_major_from_version(version)
+      version.to_s.split('.').first
+    end
+
+    def nodejs_arch
+      machine = node['kernel']['machine']
+
+      case machine
+      when /armv6l/
+        'arm-pi'
+      when /aarch64/
+        'arm64'
+      when /x86_64/
+        'x64'
+      when /\d86/
+        'x86'
+      else
+        machine
+      end
+    end
+
+    def nodejs_binary_checksum(checksums)
+      checksums["linux_#{nodejs_arch}"]
+    end
+
+    def nodejs_source_url(version, prefix_url, source_url)
+      source_url || ::URI.join(prefix_url, "v#{version}/", "node-v#{version}.tar.gz").to_s
+    end
+
+    def nodejs_binary_url(version, prefix_url, binary_url)
+      binary_url || ::URI.join(prefix_url, "v#{version}/", "node-v#{version}-linux-#{nodejs_arch}.tar.gz").to_s
+    end
+
+    def npm_dist(version, url = nil)
+      return { 'url' => url } if url
+
+      require 'open-uri'
+      require 'json'
+      result = JSON.parse(URI.parse("https://registry.npmjs.org/npm/#{version}").read, max_nesting: false)
+      ret = { 'url' => result['dist']['tarball'], 'version' => result['_npmVersion'], 'shasum' => result['dist']['shasum'] }
+      Chef::Log.debug("Npm dist #{ret}")
+      ret
+    end
+
     def npm_list(package, path = nil, environment = {})
       require 'json'
       cmd = if path
@@ -47,9 +124,7 @@ module NodeJs
       (version ? list[package]['version'] == version : true)
     end
 
-    def npm_package_installed?(package, version = nil, path = nil, npm_token = nil)
-      environment = { 'NPM_TOKEN' => npm_token } if npm_token
-
+    def npm_package_installed?(package, version = nil, path = nil, environment = {})
       list = npm_list(package, path, environment)['dependencies']
       # Return true if package installed and installed to good version
       # see if we really want to add the url check

cookbooks/nodejs/metadata.json

@@ -1,27 +1,27 @@
 {
   "name": "nodejs",
-  "description": "Installs/Configures node.js",
+  "description": "Provides resources for installing Node.js and managing npm packages",
   "long_description": "",
-  "maintainer": "redguide",
-  "maintainer_email": "guilhem@lettron.fr",
+  "maintainer": "Sous Chefs",
+  "maintainer_email": "help@sous-chefs.org",
   "license": "Apache-2.0",
   "platforms": {
-    "debian": ">= 0.0.0",
-    "ubuntu": ">= 0.0.0",
-    "centos": ">= 0.0.0",
-    "redhat": ">= 0.0.0",
-    "scientific": ">= 0.0.0",
-    "oracle": ">= 0.0.0",
-    "amazon": ">= 0.0.0",
-    "smartos": ">= 0.0.0",
+    "almalinux": ">= 8.0",
+    "amazon": ">= 2023.0",
+    "centos_stream": ">= 9.0",
+    "debian": ">= 12.0",
+    "fedora": ">= 0.0.0",
     "mac_os_x": ">= 0.0.0",
-    "opensuseleap": ">= 0.0.0",
-    "suse": ">= 0.0.0",
+    "oracle": ">= 8.0",
+    "redhat": ">= 8.0",
+    "rocky": ">= 8.0",
+    "ubuntu": ">= 22.04",
     "windows": ">= 0.0.0"
   },
   "dependencies": {
     "ark": ">= 2.0.2",
-    "chocolatey": ">= 3.0"
+    "chocolatey": ">= 3.0",
+    "yum": ">= 7.2"
   },
   "providing": {
 
@@ -29,13 +29,13 @@
   "recipes": {
 
   },
-  "version": "7.3.3",
-  "source_url": "https://github.com/redguide/nodejs",
-  "issues_url": "https://github.com/redguide/nodejs/issues",
+  "version": "11.0.1",
+  "source_url": "https://github.com/sous-chefs/nodejs",
+  "issues_url": "https://github.com/sous-chefs/nodejs/issues",
   "privacy": false,
   "chef_versions": [
     [
-      ">= 14"
+      ">= 15.3"
     ]
   ],
   "ohai_versions": [

cookbooks/nodejs/metadata.rb

@@ -1,16 +1,27 @@
-name 'nodejs'
-maintainer 'redguide'
-maintainer_email 'guilhem@lettron.fr'
-license 'Apache-2.0'
-description 'Installs/Configures node.js'
-source_url 'https://github.com/redguide/nodejs'
-issues_url 'https://github.com/redguide/nodejs/issues'
-chef_version '>= 14'
-version '7.3.3'
+# frozen_string_literal: true
+
+name              'nodejs'
+maintainer        'Sous Chefs'
+maintainer_email  'help@sous-chefs.org'
+license           'Apache-2.0'
+description       'Provides resources for installing Node.js and managing npm packages'
+version           '11.0.1'
+source_url        'https://github.com/sous-chefs/nodejs'
+issues_url        'https://github.com/sous-chefs/nodejs/issues'
+chef_version      '>= 15.3'
+
+supports 'almalinux', '>= 8.0'
+supports 'amazon', '>= 2023.0'
+supports 'centos_stream', '>= 9.0'
+supports 'debian', '>= 12.0'
+supports 'fedora'
+supports 'mac_os_x'
+supports 'oracle', '>= 8.0'
+supports 'redhat', '>= 8.0'
+supports 'rocky', '>= 8.0'
+supports 'ubuntu', '>= 22.04'
+supports 'windows'
 
 depends 'ark', '>= 2.0.2'
 depends 'chocolatey', '>= 3.0'
-
-%w(debian ubuntu centos redhat scientific oracle amazon smartos mac_os_x opensuseleap suse windows).each do |os|
-  supports os
-end
+depends 'yum', '>= 7.2'

cookbooks/nodejs/migration.md

@@ -0,0 +1,52 @@
+# Migration Guide
+
+This release is a breaking migration from recipes and node attributes to custom resources.
+
+## What Changed
+
+The cookbook no longer exposes `nodejs::default`, `nodejs::install`, `nodejs::repo`, `nodejs::npm`, `nodejs::npm_packages`, or the install-method recipes. The `attributes/` directory was removed. Configure Node.js through resource properties instead of `node['nodejs']` attributes.
+
+## Recipe to Resource Mapping
+
+| Before                                            | After                                                         |
+| ------------------------------------------------- | ------------------------------------------------------------- |
+| `include_recipe 'nodejs::default'`                | `nodejs_install 'nodejs'` plus optional `nodejs_npm_packages` |
+| `include_recipe 'nodejs::repo'`                   | `nodejs_repository 'nodesource'`                              |
+| `include_recipe 'nodejs::nodejs_from_package'`    | `nodejs_install 'nodejs' do install_method 'package' end`     |
+| `include_recipe 'nodejs::nodejs_from_binary'`     | `nodejs_install 'nodejs' do install_method 'binary' end`      |
+| `include_recipe 'nodejs::nodejs_from_source'`     | `nodejs_install 'nodejs' do install_method 'source' end`      |
+| `include_recipe 'nodejs::nodejs_from_chocolatey'` | `nodejs_install 'nodejs' do install_method 'chocolatey' end`  |
+| `include_recipe 'nodejs::npm'`                    | `nodejs_npm_install 'npm'`                                    |
+| `node['nodejs']['npm_packages']`                  | `nodejs_npm_packages 'packages'`                              |
+
+## Examples
+
+Install Node.js from NodeSource packages:
+
+```ruby
+nodejs_install 'nodejs' do
+  install_method 'package'
+  version '24.15.0'
+end
+```
+
+Install packages that used to be configured with `node['nodejs']['npm_packages']`:
+
+```ruby
+nodejs_npm_packages 'application packages' do
+  packages [
+    { name: 'express' },
+    { name: 'socket.io', version: '4.8.1' },
+  ]
+end
+```
+
+The `nodejs_npm` alias still works for the `npm_package` resource, but it no longer auto-includes any Node.js or npm recipes. Install Node.js first:
+
+```ruby
+nodejs_install 'nodejs'
+
+nodejs_npm 'express'
+```
+
+See `test/cookbooks/test/recipes/` for runnable migration examples used by Kitchen.

cookbooks/nodejs/recipes/default.rb

@@ -1,23 +0,0 @@
-
-# Author:: Marius Ducea (marius@promethost.com)
-# Cookbook:: nodejs
-# Recipe:: default
-#
-# Copyright:: 2010-2017, Promet Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe 'nodejs::install' if node['nodejs']['manage_node']
-include_recipe 'nodejs::npm' if node['nodejs']['manage_node']
-include_recipe 'nodejs::npm_packages' if node['nodejs']['manage_node']

cookbooks/nodejs/recipes/install.rb

@@ -1,21 +0,0 @@
-#
-# Author:: Marius Ducea (marius@promethost.com)
-# Cookbook:: nodejs
-# Recipe:: install
-#
-# Copyright:: 2010-2017, Promet Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe "nodejs::nodejs_from_#{node['nodejs']['install_method']}"

cookbooks/nodejs/recipes/iojs.rb

@@ -1 +0,0 @@
-Chef::Log.fatal('The nodejs::iojs recipe has been deprecated. If you need iojs installation pin to cookbook version 3.0.1.')

cookbooks/nodejs/recipes/nodejs.rb

@@ -1,21 +0,0 @@
-#
-# Author:: Marius Ducea (marius@promethost.com)
-# Cookbook:: nodejs
-# Recipe:: nodejs
-#
-# Copyright:: 2010-2017, Promet Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Chef::Log.fatal('The nodejs::nodejs recipe is no longer used. Use nodejs::install to install nodejs instead.')

cookbooks/nodejs/recipes/nodejs_from_binary.rb

@@ -1,67 +0,0 @@
-#
-# Author:: Julian Wilde (jules@jules.com.au)
-# Cookbook:: nodejs
-# Recipe:: install_from_binary
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Chef::DSL::Recipe.include NodeJs::Helper
-
-# Shamelessly borrowed from http://docs.chef.io/dsl_recipe_method_platform.html
-# Surely there's a more canonical way to get arch?
-arch = if node['kernel']['machine'] =~ /armv6l/
-         # FIXME: This should really check the version of node we're looking for
-         # as it seems that they haven't build an `arm-pi` version in a while...
-         # if it's old, return this, otherwise just return `node['kernel']['machine']`
-         'arm-pi' # assume a raspberry pi
-       elsif node['kernel']['machine'] =~ /aarch64/
-         'arm64'
-       elsif node['kernel']['machine'] =~ /x86_64/
-         'x64'
-       elsif node['kernel']['machine'] =~ /\d86/
-         'x86'
-       else
-         node['kernel']['machine']
-       end
-
-# needed to uncompress the binary
-package 'tar' if platform_family?('rhel', 'fedora', 'amazon', 'suse')
-
-# package_stub is for example: "node-v6.9.1-linux-x64.tar.gz"
-version = "v#{node['nodejs']['version']}/"
-prefix = node['nodejs']['prefix_url']['node']
-
-filename = "node-v#{node['nodejs']['version']}-linux-#{arch}.tar.gz"
-archive_name = 'nodejs-binary'
-binaries = ['bin/node']
-
-binaries.push('bin/npm') if node['nodejs']['npm']['install_method'] == 'embedded'
-binaries.push('bin/npx') if node['nodejs']['npm']['install_method'] == 'embedded'
-
-if node['nodejs']['binary']['url']
-  nodejs_bin_url = node['nodejs']['binary']['url']
-  checksum = node['nodejs']['binary']['checksum']
-else
-  nodejs_bin_url = ::URI.join(prefix, version, filename).to_s
-  checksum = node['nodejs']['binary']['checksum']["linux_#{arch}"]
-end
-
-ark archive_name do
-  url nodejs_bin_url
-  version node['nodejs']['version']
-  checksum checksum
-  has_binaries binaries
-  append_env_path node['nodejs']['binary']['append_env_path']
-  action :install
-end

cookbooks/nodejs/recipes/nodejs_from_chocolatey.rb

@@ -1,24 +0,0 @@
-#
-# Author:: Hossein Margani (hossein@margani.dev)
-# Cookbook:: nodejs
-# Recipe:: install_from_chocolatey
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe 'chocolatey'
-
-chocolatey_package 'nodejs-lts' do
-  version node['nodejs']['version'] if node['nodejs']['version']
-  action :upgrade
-end

cookbooks/nodejs/recipes/nodejs_from_package.rb

@@ -1,36 +0,0 @@
-#
-# Author:: Nathan L Smith (nlloyds@gmail.com)
-# Author:: Marius Ducea (marius@promethost.com)
-# Cookbook:: nodejs
-# Recipe:: package
-#
-# Copyright:: 2012-2017, Cramer Development, Inc.
-# Copyright:: 2013-2017, Opscale
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe 'nodejs::repo' if node['nodejs']['install_repo']
-
-unless node['nodejs']['packages']
-  Chef::Log.error 'No package for nodejs'
-  Chef::Log.warn 'Please use the source or binary method to install node'
-  return
-end
-
-node['nodejs']['packages'].each do |node_pkg|
-  package node_pkg do
-    action node['nodejs']['package_action'][node_pkg] if node['nodejs']['package_action'][node_pkg]
-    options node['nodejs']['package_options'][node_pkg] if node['nodejs']['package_options'][node_pkg]
-  end
-end

cookbooks/nodejs/recipes/nodejs_from_source.rb

@@ -1,49 +0,0 @@
-#
-# Author:: Marius Ducea (marius@promethost.com)
-# Cookbook:: nodejs
-# Recipe:: source
-#
-# Copyright:: 2010-2017, Promet Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Chef::DSL::Recipe.include NodeJs::Helper
-
-build_essential 'install build tools'
-
-case node['platform_family']
-when 'rhel', 'fedora', 'amazon'
-  # The ark resource uses and requires python2 for builds
-  package %w(openssl-devel python2 tar)
-when 'debian'
-  package %w(libssl-dev python)
-when 'suse'
-  package %w(python)
-end
-
-version = "v#{node['nodejs']['version']}/"
-prefix = node['nodejs']['prefix_url']['node']
-filename = "node-v#{node['nodejs']['version']}.tar.gz"
-archive_name = 'nodejs-source'
-
-nodejs_src_url = node['nodejs']['source']['url'] || ::URI.join(prefix, version, filename).to_s
-
-ark archive_name do
-  url nodejs_src_url
-  version node['nodejs']['version']
-  checksum node['nodejs']['source']['checksum']
-  make_opts ["-j #{node['nodejs']['make_threads']}"]
-  action :install_with_make
-  environment(PYTHON: 'python2')
-end

cookbooks/nodejs/recipes/npm.rb

@@ -1,28 +0,0 @@
-#
-# Author:: Marius Ducea (marius@promethost.com)
-# Cookbook:: nodejs
-# Recipe:: npm
-#
-# Copyright:: 2010-2017, Promet Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-case node['nodejs']['npm']['install_method']
-when 'embedded'
-  include_recipe 'nodejs::install'
-when 'source'
-  include_recipe 'nodejs::npm_from_source'
-else
-  Chef::Log.error('No install method found for npm')
-end

cookbooks/nodejs/recipes/npm_from_source.rb

@@ -1,32 +0,0 @@
-#
-# Author:: Marius Ducea (marius@promethost.com)
-# Cookbook:: nodejs
-# Recipe:: npm
-#
-# Copyright:: 2010-2017, Promet Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Chef::DSL::Recipe.include NodeJs::Helper
-
-include_recipe 'nodejs::nodejs_from_source'
-
-dist = npm_dist
-
-ark 'npm' do
-  url dist['url']
-  checksum dist['checksum']
-  version dist['version']
-  action :install_with_make
-end

cookbooks/nodejs/recipes/npm_packages.rb

@@ -1,13 +0,0 @@
-if node['nodejs'].key?('npm_packages')
-  node['nodejs']['npm_packages'].each do |pkg|
-    pkg_action = pkg.key?('action') ? pkg['action'] : :install
-    f = npm_package "nodejs_npm-#{pkg['name']}-#{pkg_action}" do
-      action :nothing
-      package pkg['name']
-    end
-    pkg.each do |key, value|
-      f.send(key, value) unless key == 'name' || key == 'action'
-    end
-    f.action(pkg_action)
-  end
-end

cookbooks/nodejs/recipes/repo.rb

@@ -1,19 +0,0 @@
-case node['platform_family']
-when 'debian'
-  package 'nodejs-apt-transport-https' do
-    package_name 'apt-transport-https'
-  end
-
-  apt_repository 'node.js' do
-    uri node['nodejs']['repo']
-    components ['main']
-    keyserver node['nodejs']['keyserver']
-    key node['nodejs']['key']
-  end
-when 'rhel', 'fedora', 'amazon'
-  yum_repository 'node.js' do
-    description 'nodesource.com nodejs repository'
-    baseurl node['nodejs']['repo']
-    gpgkey node['nodejs']['key']
-  end
-end

cookbooks/nodejs/release-please-config.json

@@ -0,0 +1,12 @@
+{
+  "packages": {
+    ".": {
+      "package-name": "nodejs",
+      "changelog-path": "CHANGELOG.md",
+      "release-type": "ruby",
+      "include-component-in-tag": false,
+      "version-file": "metadata.rb"
+    }
+  },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}

cookbooks/nodejs/renovate.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base"],
+  "packageRules": [
+    {
+      "groupName": "Actions",
+      "matchUpdateTypes": ["minor", "patch", "pin"],
+      "automerge": true,
+      "addLabels": ["Release: Patch", "Skip: Announcements"]
+    },
+    {
+      "groupName": "Actions",
+      "matchUpdateTypes": ["major"],
+      "automerge": false,
+      "addLabels": ["Release: Patch", "Skip: Announcements"]
+    }
+  ]
+}

cookbooks/nodejs/resources/_partial/_nodejs.rb

@@ -0,0 +1,2 @@
+property :version, String, default: '24.15.0'
+property :prefix_url, String, default: 'https://nodejs.org/dist/'

cookbooks/nodejs/resources/nodejs_install.rb

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+provides :nodejs_install
+unified_mode true
+
+use '_partial/_nodejs'
+
+property :install_method, String, equal_to: %w(package binary source chocolatey)
+property :install_repository, [true, false], default: true
+property :packages, [Array, nil], default: nil
+property :package_action, [Symbol, String], default: :install
+property :package_options, [String, nil]
+property :disable_dnf_module, [true, false], default: true
+property :source_url, [String, nil]
+property :source_checksum, [String, nil], default: '729de494dd2872e5a3a6c32a1cd156a5413d4aca2772b2d873ee86bb5531bcd9'
+property :binary_url, [String, nil]
+property :binary_checksums, Hash,
+         default: {
+           'linux_x64' => '44836872d9aec49f1e6b52a9a922872db9a2b02d235a616a5681b6a85fec8d89',
+           'linux_arm64' => '73afc234d558c24919875f51c2d1ea002a2ada4ea6f83601a383869fefa64eed',
+         }
+property :append_env_path, [true, false], default: true
+property :make_threads, [Integer, String, nil], default: nil
+property :build_packages, [Array, nil], default: nil
+property :chocolatey_package_name, String, default: 'nodejs-lts'
+
+default_action :install
+
+action :install do
+  case requested_install_method
+  when 'package'
+    nodejs_repository 'nodesource' do
+      node_major node_major_from_version(new_resource.version)
+      action :create
+      only_if { new_resource.install_repository }
+    end
+
+    dnf_module 'nodejs' do
+      action :disable
+      only_if { disable_dnf_module? }
+    end
+
+    resolved_packages.each do |pkg|
+      package pkg do
+        action new_resource.package_action.to_sym
+        options new_resource.package_options if new_resource.package_options
+      end
+    end
+  when 'binary'
+    package 'tar' if platform_family?('rhel', 'fedora', 'amazon', 'suse')
+
+    ark 'nodejs-binary' do
+      url nodejs_binary_url(new_resource.version, new_resource.prefix_url, new_resource.binary_url)
+      version new_resource.version
+      checksum nodejs_binary_checksum(new_resource.binary_checksums) unless new_resource.binary_url
+      has_binaries %w(bin/node bin/npm bin/npx)
+      append_env_path new_resource.append_env_path
+      action :install
+    end
+  when 'source'
+    build_essential 'install build tools'
+
+    (new_resource.build_packages || default_build_packages).each do |pkg|
+      if dnf_python_package?(pkg)
+        execute 'install python3 build package' do
+          command 'dnf -y install python3'
+          not_if 'command -v python3'
+          only_if 'command -v dnf'
+        end
+      else
+        package pkg
+      end
+    end
+
+    link '/usr/local/bin/python' do
+      to '/usr/bin/python3'
+      not_if { ::File.exist?('/usr/bin/python') || ::File.exist?('/usr/local/bin/python') }
+      only_if { ::File.exist?('/usr/bin/python3') }
+    end
+
+    ark 'nodejs-source' do
+      url nodejs_source_url(new_resource.version, new_resource.prefix_url, new_resource.source_url)
+      version new_resource.version
+      checksum new_resource.source_checksum if new_resource.source_checksum
+      make_opts ["-j #{new_resource.make_threads || default_make_threads}"]
+      environment(PYTHON: 'python3')
+      action :install_with_make
+    end
+  when 'chocolatey'
+    chocolatey_package new_resource.chocolatey_package_name do
+      version new_resource.version if new_resource.version
+      action :upgrade
+    end
+  end
+end
+
+action :remove do
+  case requested_install_method
+  when 'package'
+    resolved_packages.each do |pkg|
+      package pkg do
+        action :remove
+      end
+    end
+
+    nodejs_repository 'nodesource' do
+      action :remove
+      only_if { new_resource.install_repository }
+    end
+  when 'binary'
+    ark 'nodejs-binary' do
+      action :remove
+    end
+  when 'source'
+    ark 'nodejs-source' do
+      action :remove
+    end
+  when 'chocolatey'
+    chocolatey_package new_resource.chocolatey_package_name do
+      action :remove
+    end
+  end
+end
+
+action_class do
+  include NodeJs::Helper
+
+  def requested_install_method
+    new_resource.install_method || default_install_method
+  end
+
+  def resolved_packages
+    new_resource.packages || default_packages(new_resource.install_repository)
+  end
+
+  def disable_dnf_module?
+    new_resource.disable_dnf_module &&
+      platform_family?('rhel', 'fedora') &&
+      node['platform_version'].to_i >= 8 &&
+      dnf_module_available?('nodejs')
+  end
+
+  def dnf_module_available?(module_name)
+    shell_out!("dnf -q module list #{module_name}", returns: [0, 1]).stdout.match?(/^#{Regexp.escape(module_name)}\s/m)
+  end
+end

cookbooks/nodejs/resources/nodejs_npm_install.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+provides :nodejs_npm_install
+unified_mode true
+
+use '_partial/_nodejs'
+
+property :install_method, String, equal_to: %w(embedded source), default: 'embedded'
+property :install_node, [true, false], default: true
+property :node_install_method, String, equal_to: %w(package binary source chocolatey), default: 'package'
+property :npm_version, String, default: 'latest'
+property :npm_url, [String, nil]
+property :npm_checksum, [String, nil]
+property :make_threads, [Integer, String, nil], default: nil
+
+default_action :install
+
+action :install do
+  nodejs_install 'nodejs for npm' do
+    install_method new_resource.node_install_method
+    version new_resource.version
+    prefix_url new_resource.prefix_url
+    action :install
+    only_if { new_resource.install_node }
+  end
+
+  ark 'npm' do
+    url lazy { npm_dist(new_resource.npm_version, new_resource.npm_url)['url'] }
+    checksum new_resource.npm_checksum if new_resource.npm_checksum
+    version lazy { npm_dist(new_resource.npm_version, new_resource.npm_url)['version'] || new_resource.npm_version }
+    make_opts ["-j #{new_resource.make_threads || default_make_threads}"]
+    action :install_with_make
+    only_if { new_resource.install_method == 'source' }
+  end
+end
+
+action :remove do
+  ark 'npm' do
+    action :remove
+    only_if { new_resource.install_method == 'source' }
+  end
+end
+
+action_class do
+  include NodeJs::Helper
+end

cookbooks/nodejs/resources/nodejs_npm_packages.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+provides :nodejs_npm_packages
+unified_mode true
+
+property :packages, Array, default: []
+
+default_action :install
+
+action :install do
+  new_resource.packages.each do |pkg|
+    package_properties = normalize_package(pkg)
+    pkg_action = package_properties.delete(:action) || :install
+    pkg_name = package_properties.delete(:package)
+
+    npm_package "nodejs_npm-#{pkg_name}-#{pkg_action}" do
+      package pkg_name
+      package_properties.each do |property_name, property_value|
+        send(property_name, property_value)
+      end
+      action pkg_action.to_sym
+    end
+  end
+end
+
+action :remove do
+  new_resource.packages.each do |pkg|
+    package_properties = normalize_package(pkg)
+    pkg_name = package_properties[:package]
+
+    npm_package "nodejs_npm-#{pkg_name}-remove" do
+      package pkg_name
+      action :remove
+    end
+  end
+end
+
+action_class do
+  def normalize_package(pkg)
+    pkg.each_with_object({}) do |(key, value), memo|
+      property_name = key.to_sym
+      property_name = :package if property_name == :name
+      memo[property_name] = value
+    end
+  end
+end

cookbooks/nodejs/resources/nodejs_repository.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+provides :nodejs_repository
+unified_mode true
+
+property :repo_name, String, name_property: true
+property :node_major, [String, Integer], default: '24'
+property :apt_uri, String
+property :apt_distribution, String, default: 'nodistro'
+property :apt_components, Array, default: ['main']
+property :apt_key, String, default: 'https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key'
+property :apt_keyring, String, default: '/etc/apt/keyrings/nodesource.asc'
+property :apt_pin_priority, String, default: '600'
+property :yum_baseurl, String
+property :yum_gpgkey, String, default: 'https://rpm.nodesource.com/gpgkey/ns-operations-public.key'
+property :yum_priority, String, default: '9'
+property :enabled, [true, false], default: true
+property :gpgcheck, [true, false], default: true
+
+default_action :create
+
+action :create do
+  case node['platform_family']
+  when 'debian'
+    package %w(ca-certificates curl gnupg apt-transport-https)
+
+    directory ::File.dirname(new_resource.apt_keyring) do
+      recursive true
+      mode '0755'
+    end
+
+    remote_file new_resource.apt_keyring do
+      source new_resource.apt_key
+      mode '0644'
+    end
+
+    apt_preference new_resource.repo_name do
+      glob '*'
+      pin 'origin deb.nodesource.com'
+      pin_priority new_resource.apt_pin_priority
+    end
+
+    apt_repository new_resource.repo_name do
+      uri lazy { new_resource.apt_uri || "https://deb.nodesource.com/node_#{new_resource.node_major}.x" }
+      components new_resource.apt_components
+      signed_by new_resource.apt_keyring
+      distribution new_resource.apt_distribution
+    end
+  when 'rhel', 'fedora', 'amazon'
+    yum_repository "#{new_resource.repo_name}-nodejs" do
+      description 'nodesource.com nodejs repository'
+      baseurl lazy { new_resource.yum_baseurl || "https://rpm.nodesource.com/pub_#{new_resource.node_major}.x/nodistro/nodejs/$basearch" }
+      gpgkey new_resource.yum_gpgkey
+      priority new_resource.yum_priority
+      enabled new_resource.enabled
+      gpgcheck new_resource.gpgcheck
+      options(module_hotfixes: 1)
+      action :create
+    end
+  end
+end
+
+action :remove do
+  case node['platform_family']
+  when 'debian'
+    apt_repository new_resource.repo_name do
+      action :remove
+    end
+
+    file new_resource.apt_keyring do
+      action :delete
+    end
+  when 'rhel', 'fedora', 'amazon'
+    yum_repository "#{new_resource.repo_name}-nodejs" do
+      action :remove
+    end
+  end
+end

cookbooks/nodejs/resources/npm_package.rb

@@ -1,28 +1,8 @@
-#
-# Cookbook:: nodejs
-# Resource:: npm
-#
-# Author:: Sergey Balbeko <sergey@balbeko.com>
-#
-# Copyright:: 2012-2017, Sergey Balbeko
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+# frozen_string_literal: true
 
-resource_name :npm_package
 provides :npm_package
+unified_mode true
 
-# backwards compatibility for the old resource name
 provides :nodejs_npm
 
 property :package, String, name_property: true
@@ -30,7 +10,7 @@ property :version, String
 property :path, String
 property :url, String
 property :json, [String, true, false]
-property :npm_token, String
+property :npm_token, String, sensitive: true
 property :options, Array, default: []
 property :user, String
 property :group, String
@@ -38,10 +18,7 @@ property :live_stream, [false, true], default: false
 property :node_env, String
 property :auto_update, [true, false], default: true
 
-def initialize(*args)
-  super
-  @run_context.include_recipe 'nodejs::npm' if node['nodejs']['manage_node']
-end
+default_action :install
 
 action :install do
   execute "install NPM package #{new_resource.package}" do
@@ -51,7 +28,8 @@ action :install do
     group new_resource.group
     environment npm_env_vars
     live_stream new_resource.live_stream
-    not_if { package_installed? && no_auto_update? }
+    sensitive true if new_resource.npm_token
+    not_if { no_auto_update? && package_installed? }
   end
 end
 
@@ -63,6 +41,20 @@ action :uninstall do
     group new_resource.group
     environment npm_env_vars
     live_stream new_resource.live_stream
+    sensitive true if new_resource.npm_token
+    only_if { package_installed? }
+  end
+end
+
+action :remove do
+  execute "uninstall NPM package #{new_resource.package}" do
+    cwd new_resource.path
+    command "npm uninstall #{npm_options}"
+    user new_resource.user
+    group new_resource.group
+    environment npm_env_vars
+    live_stream new_resource.live_stream
+    sensitive true if new_resource.npm_token
     only_if { package_installed? }
   end
 end
@@ -75,13 +67,19 @@ action_class do
     env_vars['HOME'] = ::Dir.home(new_resource.user) if new_resource.user
     env_vars['USER'] = new_resource.user if new_resource.user
     env_vars['NPM_TOKEN'] = new_resource.npm_token if new_resource.npm_token
-    env_vars['NODE_ENV'] =  new_resource.node_env if new_resource.node_env
+    env_vars['NODE_ENV'] = new_resource.node_env if new_resource.node_env
 
     env_vars
   end
 
   def package_installed?
-    new_resource.package && npm_package_installed?(new_resource.package, new_resource.version, new_resource.path, new_resource.npm_token)
+    return package_json_installed? if new_resource.json == true
+
+    new_resource.package && npm_package_installed?(new_resource.package, new_resource.version, new_resource.path, npm_env_vars)
+  end
+
+  def package_json_installed?
+    new_resource.path && ::File.exist?(::File.join(new_resource.path, 'node_modules'))
   end
 
   def no_auto_update?
@@ -89,7 +87,7 @@ action_class do
   end
 
   def npm_options
-    options = ''
+    options = +''
     options << ' -global' unless new_resource.path
     new_resource.options.each do |option|
       options << " #{option}"

cookbooks/postfix/.markdownlint-cli2.yaml

@@ -3,3 +3,5 @@ config:
   line-length: false # MD013
   no-duplicate-heading: false # MD024
   reference-links-images: false # MD052
+ignores:
+  - .github/copilot-instructions.md

cookbooks/postfix/.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "chef-software.chef",
+    "Shopify.ruby-lsp",
+    "editorconfig.editorconfig",
+    "DavidAnson.vscode-markdownlint"
+  ]
+}

cookbooks/postfix/CHANGELOG.md

@@ -2,9 +2,48 @@
 
 This file is used to list changes made in each version of the postfix cookbook.
 
+## Unreleased
+
+## 6.4.1 - *2025-09-04*
+
+## 6.4.0 - *2025-07-30* ## 6.4.0 - *2025-07-30*
+
+Standardise files with files in sous-chefs/repo-management
+
+## 6.4.0 - *2025-07-30*
+
+## 6.3.0 - *2025-07-30*
+
+- Use LMDB instead of hash on el10
+
+## 6.3.0 - *2025-07-30*
+
+## 6.2.2 - *2025-01-30*
+
+## 6.2.1 - *2025-01-30*
+
+## 6.2.0 - *2025-01-30*
+
+## 6.2.0
+
+- Correctly fix aliases quoting logic
+- Convert all serverspec tests to inspec
+- Add Github actions
+- Update platforms to test
+
+## 6.0.29 - *2024-11-18*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 6.0.28 - *2024-07-15*
+
+- Standardise files with files in sous-chefs/repo-management
+
+## 6.0.27 - *2024-05-06*
+
 ## 6.0.26 - *2023-10-03*
 
-- add installation of postfix addon packages for RHEL 8
+- Add installation of postfix addon packages for RHEL 8
 
 ## 6.0.25 - *2023-10-03*
 

cookbooks/postfix/attributes/default.rb

@@ -13,9 +13,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-default['postfix']['packages'] = %w(postfix)
-
+default['postfix']['packages'] = value_for_platform(
+  amazon: { '>= 2023' => %w(postfix postfix-lmdb) },
+  default: %w(postfix)
+)
 # Generic cookbook attributes
 default['postfix']['mail_type'] = 'client'
 default['postfix']['relayhost_role'] = 'relayhost'
@@ -37,11 +38,19 @@ default['postfix']['master_template_source'] = 'postfix'
 default['postfix']['sender_canonical_map_entries'] = {}
 default['postfix']['smtp_generic_map_entries'] = {}
 default['postfix']['recipient_canonical_map_entries'] = {}
-default['postfix']['access_db_type'] = 'hash'
-default['postfix']['aliases_db_type'] = 'hash'
-default['postfix']['transport_db_type'] = 'hash'
-default['postfix']['virtual_alias_db_type'] = 'hash'
-default['postfix']['virtual_alias_domains_db_type'] = 'hash'
+
+default['postfix']['db_type'] = value_for_platform(
+  %w(centos redhat almalinux rocky oracle) => { '>= 10' => 'lmdb' },
+  amazon: { '>= 2023' => 'lmdb' },
+  %w(opensuseleap suse) => { '>= 15' => 'lmdb' },
+  default: 'hash'
+)
+
+default['postfix']['access_db_type'] = lazy { node['postfix']['db_type'] }
+default['postfix']['aliases_db_type'] = lazy { node['postfix']['db_type'] }
+default['postfix']['transport_db_type'] = lazy { node['postfix']['db_type'] }
+default['postfix']['virtual_alias_db_type'] = lazy { node['postfix']['db_type'] }
+default['postfix']['virtual_alias_domains_db_type'] = lazy { node['postfix']['db_type'] }
 
 case node['platform']
 when 'smartos'
@@ -96,6 +105,9 @@ default['postfix']['main']['smtp_sasl_auth_enable'] = 'no'
 default['postfix']['main']['mailbox_size_limit'] = 0
 default['postfix']['main']['mynetworks'] = nil
 default['postfix']['main']['inet_interfaces'] = 'loopback-only'
+default['postfix']['main']['default_database_type'] = lazy { node['postfix']['db_type'] }
+default['postfix']['main']['alias_database'] = lazy { "#{node['postfix']['db_type']}:#{node['postfix']['aliases_db']}" }
+default['postfix']['main']['alias_maps'] = lazy { "#{node['postfix']['db_type']}:#{node['postfix']['aliases_db']}" }
 
 # Conditional attributes, also reference _attributes recipe
 case node['platform_family']
@@ -407,4 +419,4 @@ default['postfix']['aliases'] = if platform?('freebsd')
                                   {}
                                 end
 
-default['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps']
+default['postfix']['main']['smtpd_relay_restrictions'] = lazy { "#{node['postfix']['db_type']}:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps'] }

cookbooks/postfix/metadata.json

@@ -26,7 +26,7 @@
   "recipes": {
 
   },
-  "version": "6.0.26",
+  "version": "6.4.1",
   "source_url": "https://github.com/sous-chefs/postfix",
   "issues_url": "https://github.com/sous-chefs/postfix/issues",
   "privacy": false,

cookbooks/postfix/metadata.rb

@@ -3,7 +3,7 @@ maintainer        'Sous Chefs'
 maintainer_email  'help@sous-chefs.org'
 license           'Apache-2.0'
 description       'Installs and configures postfix for client or outbound relayhost, or to do SASL auth'
-version           '6.0.26'
+version           '6.4.1'
 source_url        'https://github.com/sous-chefs/postfix'
 issues_url        'https://github.com/sous-chefs/postfix/issues'
 chef_version      '>= 12.15'

cookbooks/postfix/recipes/_attributes.rb

@@ -29,24 +29,22 @@ end
 
 if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes'
   node.default_unless['postfix']['sasl_password_file'] = "#{node['postfix']['conf_dir']}/sasl_passwd"
-  node.default_unless['postfix']['main']['smtp_sasl_password_maps'] = "hash:#{node['postfix']['sasl_password_file']}"
+  node.default_unless['postfix']['main']['smtp_sasl_password_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['sasl_password_file']}"
   node.default_unless['postfix']['main']['smtp_sasl_security_options'] = 'noanonymous'
-  node.default_unless['postfix']['sasl']['smtp_sasl_user_name'] = ''
-  node.default_unless['postfix']['sasl']['smtp_sasl_passwd']    = ''
   node.default_unless['postfix']['main']['relayhost'] = ''
 end
 
-node.default_unless['postfix']['main']['alias_maps'] = ["hash:#{node['postfix']['aliases_db']}"] if node['postfix']['use_alias_maps']
+node.default_unless['postfix']['main']['alias_maps'] = ["#{node['postfix']['db_type']}:#{node['postfix']['aliases_db']}"] if node['postfix']['use_alias_maps']
 
-node.default_unless['postfix']['main']['transport_maps'] = ["hash:#{node['postfix']['transport_db']}"] if node['postfix']['use_transport_maps']
+node.default_unless['postfix']['main']['transport_maps'] = ["#{node['postfix']['db_type']}:#{node['postfix']['transport_db']}"] if node['postfix']['use_transport_maps']
 
-node.default_unless['postfix']['main']['access_maps'] = ["hash:#{node['postfix']['access_db']}"] if node['postfix']['use_access_maps']
+node.default_unless['postfix']['main']['access_maps'] = ["#{node['postfix']['db_type']}:#{node['postfix']['access_db']}"] if node['postfix']['use_access_maps']
 
 node.default_unless['postfix']['main']['virtual_alias_maps'] = ["#{node['postfix']['virtual_alias_db_type']}:#{node['postfix']['virtual_alias_db']}"] if node['postfix']['use_virtual_aliases']
 
 node.default_unless['postfix']['main']['virtual_alias_domains'] = ["#{node['postfix']['virtual_alias_domains_db_type']}:#{node['postfix']['virtual_alias_domains_db']}"] if node['postfix']['use_virtual_aliases_domains']
 
-node.default_unless['postfix']['main']['smtpd_relay_restrictions'] = "hash:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps']
+node.default_unless['postfix']['main']['smtpd_relay_restrictions'] = "#{node['postfix']['db_type']}:#{node['postfix']['relay_restrictions_db']}, reject" if node['postfix']['use_relay_restrictions_maps']
 
 node.default_unless['postfix']['main']['maildrop_destination_recipient_limit'] = 1 if node['postfix']['master']['maildrop']['active']
 

cookbooks/postfix/recipes/_common.rb

@@ -155,7 +155,7 @@ unless node['postfix']['sender_canonical_map_entries'].empty?
     notifies :reload, 'service[postfix]'
   end
 
-  node.default['postfix']['main']['sender_canonical_maps'] = "hash:#{node['postfix']['conf_dir']}/sender_canonical" unless node['postfix']['main'].key?('sender_canonical_maps')
+  node.default['postfix']['main']['sender_canonical_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['conf_dir']}/sender_canonical" unless node['postfix']['main'].key?('sender_canonical_maps')
 end
 
 execute 'update-postfix-smtp_generic' do
@@ -172,7 +172,7 @@ unless node['postfix']['smtp_generic_map_entries'].empty?
     notifies :reload, 'service[postfix]'
   end
 
-  node.default['postfix']['main']['smtp_generic_maps'] = "hash:#{node['postfix']['conf_dir']}/smtp_generic" unless node['postfix']['main'].key?('smtp_generic_maps')
+  node.default['postfix']['main']['smtp_generic_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['conf_dir']}/smtp_generic" unless node['postfix']['main'].key?('smtp_generic_maps')
 end
 
 execute 'update-postfix-recipient_canonical' do
@@ -189,7 +189,7 @@ unless node['postfix']['recipient_canonical_map_entries'].empty?
     notifies :reload, 'service[postfix]'
   end
 
-  node.default['postfix']['main']['recipient_canonical_maps'] = "hash:#{node['postfix']['conf_dir']}/recipient_canonical" unless node['postfix']['main'].key?('recipient_canonical_maps')
+  node.default['postfix']['main']['recipient_canonical_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['conf_dir']}/recipient_canonical" unless node['postfix']['main'].key?('recipient_canonical_maps')
 end
 
 service 'postfix' do

cookbooks/postfix/recipes/maps.rb

@@ -18,8 +18,8 @@ node['postfix']['maps'].each do |type, maps|
     package "postfix-#{type}" if %w(pgsql mysql ldap cdb).include?(type)
   end
 
-  if platform?('redhat') && node['platform_version'].to_i == 8
-    package "postfix-#{type}" if %w(pgsql mysql ldap cdb).include?(type)
+  if platform_family?('rhel') && node['platform_version'].to_i >= 8
+    package "postfix-#{type}" if %w(pgsql mysql ldap cdb lmdb).include?(type)
   end
 
   separator = if %w(pgsql mysql ldap memcache sqlite).include?(type)
@@ -32,7 +32,7 @@ node['postfix']['maps'].each do |type, maps|
       command "postmap #{file}"
       environment PATH: "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
       action :nothing
-    end if %w(btree cdb dbm hash sdbm).include?(type)
+    end if %w(btree cdb dbm hash lmdb sdbm).include?(type)
     template "#{file}-#{type}" do
       path file
       source 'maps.erb'
@@ -41,7 +41,7 @@ node['postfix']['maps'].each do |type, maps|
         map: content,
         separator: separator
       )
-      notifies :run, "execute[update-postmap-#{file}]" if %w(btree cdb dbm hash sdbm).include?(type)
+      notifies :run, "execute[update-postmap-#{file}]" if %w(btree cdb dbm hash lmdb sdbm).include?(type)
       notifies :restart, 'service[postfix]'
     end
   end

cookbooks/postfix/renovate.json

@@ -1,9 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:base"],
-  "packageRules": [{
+  "packageRules": [
+    {
       "groupName": "Actions",
-      "matchUpdateTypes": ["patch", "pin", "digest"],
+      "matchUpdateTypes": ["minor", "patch", "pin"],
       "automerge": true,
       "addLabels": ["Release: Patch", "Skip: Announcements"]
     },

cookbooks/postfix/templates/aliases.erb

@@ -6,5 +6,5 @@
 postmaster:    root
 
 <% node['postfix']['aliases'].each do |name, value| %>
-<%= name %>: <%= [value].flatten.map{|x| if (x.include?("@")) then x else %Q("#{x}") end}.join(', ') %>
+<%= name.match?(/[\s#:@]/) ? "\"#{name}\"" : name %>: <%= [value].flatten.map{|x| x.include?("|") ? "\"#{x}\"" : x}.join(',') %>
 <% end unless node['postfix']['aliases'].nil? %>

data_bags/credentials/blossom.json

@@ -0,0 +1,24 @@
+{
+  "id": "blossom",
+  "admin_password": {
+    "encrypted_data": "Gd6AzFmySL0p+xo1PnRn9p4Fwge1m3CQj+NRLIUD8P9u1C8=\n",
+    "iv": "l6KVzF9xEEBRRAmh\n",
+    "auth_tag": "P791KMh9TxuHiWJpDKxWQA==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "s3_access_key": {
+    "encrypted_data": "S8jB2LDQOxI/p5ugggW1Sk50TS9TJe9sLv04O/VD9/v22SSM7J6ETomTA+Hd\n",
+    "iv": "dUIIZbdAT9q72ioX\n",
+    "auth_tag": "+5fCNOuTE/+FqdV6rDNbkw==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  },
+  "s3_secret_key": {
+    "encrypted_data": "soT63l2frBJDNmHetXmEPvNYBsTpvTyR95FA2rxuZXvVE7hMj21La8/0Amk7\nv+mHOBUMaGG9BTLN0tVFkL0+lGPXdZJTbtDHgluk5l6lLPyc8KY=\n",
+    "iv": "RuXs2pL9C/wpwJ/w\n",
+    "auth_tag": "nu7dE2udTkxaUZCR42h09w==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  }
+}

data_bags/credentials/gandi_api.json

@@ -1,23 +1,16 @@
 {
   "id": "gandi_api",
-  "key": {
-    "encrypted_data": "lU7/xYTmP5Sb6SsK5TNNIyegWozzBtUzpg7oDdl6gcz9FEMmG2ft0Ljh5Q==\n",
-    "iv": "EZPQD3C+wsP/mBhF\n",
-    "auth_tag": "vF9E8Pj4Z8quJJdOMg/QTw==\n",
-    "version": 3,
-    "cipher": "aes-256-gcm"
-  },
   "access_token": {
-    "encrypted_data": "1Uw69JkNrmb8LU/qssuod1SlqxxrWR7TJQZeeivRrNzrMIVTEW/1uwJIYL6b\nM4GeeYl9lIRlMMmLBkc=\n",
-    "iv": "cc1GJKu6Cf4DkIgX\n",
-    "auth_tag": "ERem4S7ozG695kjvWIMghw==\n",
+    "encrypted_data": "+skwxHnpAj/3d3e2u7s7B9EydbETj8b0flWahvb5gt/o4JYFWHrhIyX/0IVa\n4wgmu08eDgU51i0knGA=\n",
+    "iv": "ONKrFCt8Oj3GKIQ5\n",
+    "auth_tag": "j9Hrk8ZZFMQub4NUO+2e4g==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   },
   "domains": {
-    "encrypted_data": "scZ5blsSjs54DlitR7KZ3enLbyceOR5q0wjHw1golQ==\n",
-    "iv": "oDcHm7shAzW97b4t\n",
-    "auth_tag": "62Zais9yf68SwmZRsmZ3hw==\n",
+    "encrypted_data": "lGfoPHdXEYYdJmoIA9M119wjVl1v4UzIv5gHADwx0A==\n",
+    "iv": "q6XKbxhW7X9ONxNt\n",
+    "auth_tag": "ns9WJH8Oe75siWu+sOZkRg==\n",
     "version": 3,
     "cipher": "aes-256-gcm"
   }

doc/mastodon.md

@@ -0,0 +1,15 @@
+# Mastodon
+
+Running on kosmos.social
+
+## Ops
+
+### Enable maintance mode
+
+Return a 503 and maintance page for all requests:
+
+    knife ssh -p2222 -a knife_zero.host "role:openresty_proxy" "sudo cp -p /var/www/maintenance.html /var/www/kosmos.social/public/ && sudo systemctl reload openresty"
+
+### Stop maintenance mode
+
+    knife ssh -p2222 -a knife_zero.host "role:openresty_proxy" "sudo rm /var/www/kosmos.social/public/maintenance.html && sudo systemctl reload openresty"

doc/postgres/migration.md

@@ -0,0 +1,287 @@
+# Migrating PostgreSQL cluster to a new major version
+
+## Summary
+
+1. Dump from a replica
+2. Restore to fresh VM running new major version
+3. Add logical replication for delta sync from current/old primary
+4. Switch primary to new server
+5. Remove logical replication on new server
+
+## Runbook
+
+* Primary host: `PRIMARY_HOST`
+* Replica host: `REPLICA_HOST`
+* New PG14 host: `NEW_HOST`
+* PostgreSQL superuser: `postgres`
+* Running locally on each machine via `sudo -u postgres`
+
+Adjust hostnames/IPs/etc. where needed.
+
+---
+
+### 🟢 0. PRIMARY — Pre-checks
+
+```bash
+sudo -u postgres psql -c "SHOW wal_level;"
+sudo -u postgres psql -c "SHOW max_replication_slots;"
+```
+
+If needed, edit config:
+
+```bash
+sudo -u postgres vi $PGDATA/postgresql.conf
+```
+
+Ensure:
+
+```conf
+wal_level = logical
+max_replication_slots = 10
+```
+
+Restart if changed:
+
+```bash
+sudo systemctl restart postgresql
+```
+
+---
+
+### 🔵🟡 3. Create keypair for syncing dump later
+
+🔵 On NEW_HOST:
+
+```bash
+sudo mkdir -p /home/postgres/.ssh && \
+sudo chown -R postgres:postgres /home/postgres && \
+sudo chmod 700 /home/postgres/.ssh && \
+sudo -u postgres bash -c 'ssh-keygen -t ecdsa -b 256 -f /home/postgres/.ssh/id_ecdsa -N "" -C "postgres@$(hostname)"' && \
+sudo cat /home/postgres/.ssh/id_ecdsa.pub
+```
+
+Copy the public key from the above output
+
+🟡 On replica:
+
+```bash
+sudo mkdir -p /home/postgres/.ssh && \
+sudo chown -R postgres:postgres /home/postgres && \
+sudo chmod 700 /home/postgres/.ssh && \
+echo [public_key] | sudo tee /home/postgres/.ssh/authorized_keys > /dev/null && \
+sudo chmod 700 /home/postgres/.ssh
+```
+
+---
+
+### 🟢 1. PRIMARY — Create publication and replication slots
+
+```bash
+sudo -u postgres pg_create_replication_publications
+```
+
+or
+
+```bash
+sudo -u postgres pg_create_replication_publication [db_name]
+```
+
+Listing publications and slots:
+
+```bash
+sudo -u postgres pg_list_replication_publications
+sudo -u postgres pg_list_replication_slots
+```
+
+---
+
+### 🟡 3. REPLICA — Pause replication
+
+```bash
+sudo -u postgres psql -c "SELECT pg_wal_replay_pause();"
+```
+
+Verify:
+
+```bash
+sudo -u postgres psql -c "SELECT pg_is_wal_replay_paused();"
+```
+
+---
+
+### 🟡 4. REPLICA — Run dump
+
+```bash
+sudo -u postgres pg_dump_all_databases
+```
+
+or
+
+```bash
+sudo -u postgres bash -c "pg_dumpall --globals-only > /tmp/globals.sql"
+sudo -u postgres pg_dump_database [db_name]
+```
+
+---
+
+### 🟡 5. REPLICA — Resume replication
+
+```bash
+sudo -u postgres psql -c "SELECT pg_wal_replay_resume();"
+```
+
+---
+
+### 🔵 6. COPY dumps to NEW HOST
+
+From NEW_HOST:
+
+```bash
+export REPLICA_HOST=[private_ip] && \
+cd /tmp && \
+sudo -u postgres scp "postgres@$REPLICA_HOST:/tmp/globals.sql" . && \
+sudo -u postgres scp "postgres@$REPLICA_HOST:/tmp/dump_*.tar.zst" .
+```
+
+---
+
+### 🔵 7. NEW HOST (PostgreSQL 14) — Restore
+
+#### 7.1 Restore globals
+
+```bash
+sudo -u postgres psql -f /tmp/globals.sql
+```
+
+---
+
+#### 7.2 Create databases
+
+```bash
+sudo -u postgres psql -Atqc "SELECT datname FROM pg_database WHERE datallowconn AND datname NOT IN ('template1')" | \
+xargs -I{} sudo -u postgres createdb {}
+```
+
+or
+
+```bash
+sudo -u postgres createdb [db_name]
+```
+
+---
+
+#### 7.3 Restore each database
+
+```bash
+sudo -u postgres pg_restore_all_databases
+```
+
+or
+
+```bash
+sudo -u postgres pg_restore_database [db_name]
+```
+
+---
+
+### 🔵 8. NEW HOST — Create subscriptions
+
+```bash
+sudo -u postgres pg_create_replication_subscriptions
+```
+
+or
+
+```bash
+sudo -u postgres pg_create_replication_subscription [db_name]
+```
+
+---
+
+### 🔵 9. NEW HOST — Monitor replication
+
+```bash
+sudo -u postgres pg_list_replication_subscriptions
+```
+
+---
+
+### 🔴 11. CUTOVER
+
+#### 11.1 Stop writes on old primary
+
+Put app(s) in maintenance mode, stop the app/daemons.
+
+---
+
+#### 11.2 Wait for replication to catch up
+
+TODO: not the best way to check, since WAL LSNs keep increasing
+
+```bash
+sudo -u postgres psql -d [db_name] -c "SELECT * FROM pg_stat_subscription;"
+```
+
+---
+
+#### 11.3 Fix sequences
+
+Run per DB:
+
+```bash
+sudo -u postgres pg_fix_sequences_in_all_databases
+```
+
+or
+
+```bash
+sudo -u postgres pg_fix_sequences [db_name]
+```
+
+---
+
+#### 11.4 Point app to NEW_HOST
+
+1. Update `pg.kosmos.local` in `/etc/hosts` on app server(s). For example:
+
+   ```bash
+   export NEW_PG_PRIMARY=[private_ip]
+   knife ssh roles:ejabberd -a knife_zero.host "sudo sed -r \"s/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\s(pg.kosmos.local)/$NEW_PG_PRIMARY\t\1/\" -i /etc/hosts"
+   ```
+
+   Or override node attribute(s) if necessary and/or approporiate.
+
+2. Start the app/daemons, and deactivate maintenance mode.
+
+---
+
+### 🧹 12. CLEANUP NEW_HOST
+
+```bash
+sudo -u postgres pg_drop_replication_subscriptions
+```
+
+---
+
+### 🧹 13. CLEANUP PRIMARY
+
+TODO: Looks like slots are dropped automatically, when subscriptions are dropped
+
+```bash
+sudo -u postgres pg_drop_replication_publications
+```
+
+---
+
+### 🧹 13. CLEANUP Chef
+
+Once all apps/databases are migrated, update the role in the node
+config of the new primary to 'postgres_primary' and converge it.
+
+Also delete the old primary node config from the Chef repo.
+
+---
+
+### ✅ DONE
+
+---

environments/production.json

@@ -18,6 +18,16 @@
         "relay_url": "wss://nostr.kosmos.org"
       }
     },
+    "blossom": {
+      "domain": "blossom.kosmos.org",
+      "storage": {
+        "s3": {
+          "endpoint": "s3.kosmos.org",
+          "region": "garage",
+          "bucket": "blossom"
+        }
+      }
+    },
     "discourse": {
       "domain": "community.kosmos.org"
     },
@@ -105,20 +115,33 @@
     },
     "strfry": {
       "domain": "nostr.kosmos.org",
-      "real_ip_header": "x-real-ip",
-      "policy_path": "/opt/strfry/strfry-policy.ts",
+      "config": {
+        "events": {
+          "max_event_size": "524288"
+        },
+        "relay": {
+          "bind": "0.0.0.0",
+          "real_ip_header": "x-real-ip",
+          "info": {
+            "name": "Kosmos Relay",
+            "description": "Members-only nostr relay for kosmos.org users",
+            "pubkey": "b3e1b7c0ef48294bd856203bfd460625de95d3afb894e5f09b14cd1f0e7097cf",
+            "contact": "ops@kosmos.org",
+            "icon": "https://assets.kosmos.org/img/app-icon-256px.png"
+          },
+          "write_policy": {
+            "plugin": "/opt/strfry/strfry-policy.ts"
+          },
+          "logging": {
+            "dump_in_all": true
+          }
+        }
+      },
       "known_pubkeys": {
         "_": "b3e1b7c0ef48294bd856203bfd460625de95d3afb894e5f09b14cd1f0e7097cf",
         "accounts": "b3e1b7c1660b7db0ecb93ec55c09e67961171a5c4e9e2602f1b47477ea61c50a",
         "bitcoincore": "47750177bb6bb113784e4973f6b2e3dd27ef1eff227d6e38d0046d618969e41a",
         "fiatjaf": "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"
-      },
-      "info": {
-        "name": "Kosmos Relay",
-        "description": "Members-only nostr relay for kosmos.org users",
-        "pubkey": "b3e1b7c0ef48294bd856203bfd460625de95d3afb894e5f09b14cd1f0e7097cf",
-        "contact": "ops@kosmos.org",
-        "icon": "https://assets.kosmos.org/img/app-icon-256px.png"
       }
     },
     "substr": {

nodes/akkounts-2.json

@@ -1,17 +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": "leo"
   },
   "automatic": {
-    "fqdn": "akkounts-1",
+    "fqdn": "akkounts-2",
     "os": "linux",
-    "os_version": "5.4.0-148-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",
@@ -24,6 +25,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos-dirsrv::hostsfile",
       "kosmos_sentry::client",
@@ -36,8 +38,7 @@
       "apt::default",
       "timezone_iii::default",
       "timezone_iii::debian",
-      "ntp::default",
-      "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -48,31 +49,20 @@
       "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": {
-        "version": "18.2.7",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib",
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "18.1.4",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai"
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
       }
     }
   },

nodes/bitcoin-2.json

@@ -3,12 +3,13 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.163"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "bitcoin-2",
     "os": "linux",
-    "os_version": "5.4.0-163-generic",
+    "os_version": "5.4.0-216-generic",
     "hostname": "bitcoin-2",
     "ipaddress": "192.168.122.148",
     "roles": [
@@ -24,6 +25,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_sentry::client",
       "tor-full",
@@ -44,6 +46,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",

nodes/discourse-2.json

@@ -4,15 +4,17 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.35"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "discourse-2",
     "os": "linux",
-    "os_version": "5.4.0-1087-kvm",
+    "os_version": "5.4.0-1133-kvm",
     "hostname": "discourse-2",
     "ipaddress": "192.168.122.104",
     "roles": [
+      "base",
       "kvm_guest",
       "garage_gateway",
       "kosmos_discourse"
@@ -20,6 +22,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_garage",
       "kosmos_garage::default",
@@ -32,6 +35,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -42,7 +46,6 @@
       "postfix::sasl_auth",
       "hostname::default",
       "firewall::default",
-      "chef-sugar::default",
       "discourse::default"
     ],
     "platform": "ubuntu",
@@ -50,18 +53,18 @@
     "cloud": null,
     "chef_packages": {
       "chef": {
-        "version": "17.9.52",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "17.9.0",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai"
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
       }
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
+    "role[base]",
     "role[kvm_guest]",
     "role[garage_gateway]",
     "role[kosmos_discourse]"

nodes/draco.kosmos.org.json

@@ -12,6 +12,7 @@
     },
     "openresty": {
       "listen_ip": "148.251.237.111",
+      "listen_ipv6": "2a01:4f8:202:804a::2",
       "log_formats": {
         "json": "{\"ip\":\"$remote_addr\",\"time\":\"$time_local\",\"host\":\"$host\",\"method\":\"$request_method\",\"uri\":\"$uri\",\"status\":$status,\"size\":$body_bytes_sent,\"referer\":\"$http_referer\",\"upstream_addr\":\"$upstream_addr\",\"upstream_response_time\":\"$upstream_response_time\",\"ua\":\"$http_user_agent\"}"
       }
@@ -35,6 +36,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::host",
       "kosmos_kvm::backup",
       "kosmos_email::firewall",
@@ -45,6 +47,7 @@
       "kosmos_garage::default",
       "kosmos_garage::firewall_rpc",
       "kosmos_assets::nginx_site",
+      "kosmos_blossom::nginx",
       "kosmos_discourse::nginx",
       "kosmos_drone::nginx",
       "kosmos_garage::nginx_web",
@@ -81,6 +84,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -110,13 +114,13 @@
     "cloud": null,
     "chef_packages": {
       "chef": {
-        "version": "18.2.7",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib",
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "18.1.4",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai"
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
       }
     }
   },

nodes/drone-1.json

@@ -3,31 +3,35 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.128"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "drone-1",
     "os": "linux",
-    "os_version": "5.4.0-1058-kvm",
+    "os_version": "5.4.0-1133-kvm",
     "hostname": "drone-1",
     "ipaddress": "192.168.122.200",
     "roles": [
+      "base",
+      "kvm_guest",
       "drone",
-      "postgresql_client",
-      "kvm_guest"
+      "postgresql_client"
     ],
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
+      "kosmos_kvm::guest",
       "kosmos_postgresql::hostsfile",
       "kosmos_drone",
       "kosmos_drone::default",
-      "kosmos_kvm::guest",
       "apt::default",
       "timezone_iii::default",
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -36,25 +40,26 @@
       "postfix::_common",
       "postfix::_attributes",
       "postfix::sasl_auth",
-      "hostname::default"
+      "hostname::default",
+      "firewall::default"
     ],
     "platform": "ubuntu",
     "platform_version": "20.04",
     "cloud": null,
     "chef_packages": {
       "chef": {
-        "version": "17.9.52",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.52/lib",
+        "version": "18.7.10",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.7.10/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "17.9.0",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.0/lib/ohai"
+        "version": "18.2.5",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.5/lib/ohai"
       }
     }
   },
   "run_list": [
-    "recipe[kosmos-base]",
+    "role[base]",
     "role[kvm_guest]",
     "role[drone]"
   ]

nodes/ejabberd-4.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.113"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "ejabberd-4",
@@ -23,6 +24,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos-dirsrv::hostsfile",
       "kosmos_postgresql::hostsfile",
@@ -37,6 +39,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",

nodes/ejabberd-8.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.123"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "ejabberd-8",
@@ -23,6 +24,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos-dirsrv::hostsfile",
       "kosmos_postgresql::hostsfile",
@@ -37,6 +39,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",

nodes/fornax.kosmos.org.json

@@ -30,6 +30,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::host",
       "kosmos_kvm::backup",
       "kosmos_openresty",
@@ -39,6 +40,7 @@
       "kosmos_garage::default",
       "kosmos_garage::firewall_rpc",
       "kosmos_assets::nginx_site",
+      "kosmos_blossom::nginx",
       "kosmos_discourse::nginx",
       "kosmos_drone::nginx",
       "kosmos_garage::nginx_web",
@@ -75,6 +77,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -104,13 +107,13 @@
     "cloud": null,
     "chef_packages": {
       "chef": {
-        "version": "18.2.7",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib",
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "18.1.4",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai"
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
       }
     }
   },

nodes/garage-11.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.165"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "garage-11",
@@ -20,6 +21,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_garage",
       "kosmos_garage::default",
@@ -30,6 +32,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",

nodes/garage-14.json

@@ -1,17 +1,18 @@
 {
-  "name": "garage-9",
+  "name": "garage-14",
   "chef_environment": "production",
   "normal": {
     "knife_zero": {
-      "host": "10.1.1.223"
-    }
+      "host": "10.1.1.151"
+    },
+    "vm_host": "leo"
   },
   "automatic": {
-    "fqdn": "garage-9",
+    "fqdn": "garage-14",
     "os": "linux",
-    "os_version": "5.4.0-1090-kvm",
-    "hostname": "garage-9",
-    "ipaddress": "192.168.122.21",
+    "os_version": "5.15.0-1095-kvm",
+    "hostname": "garage-14",
+    "ipaddress": "192.168.122.36",
     "roles": [
       "base",
       "kvm_guest",
@@ -20,6 +21,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_garage",
       "kosmos_garage::default",
@@ -30,6 +32,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -42,17 +45,17 @@
       "firewall::default"
     ],
     "platform": "ubuntu",
-    "platform_version": "20.04",
+    "platform_version": "22.04",
     "cloud": null,
     "chef_packages": {
       "chef": {
-        "version": "18.5.0",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.5.0/lib",
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "18.1.11",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.11/lib/ohai"
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
       }
     }
   },

nodes/garage-15.json

@@ -1,17 +1,18 @@
 {
-  "name": "garage-10",
+  "name": "garage-15",
   "chef_environment": "production",
   "normal": {
     "knife_zero": {
-      "host": "10.1.1.27"
-    }
+      "host": "10.1.1.82"
+    },
+    "vm_host": "leo"
   },
   "automatic": {
-    "fqdn": "garage-10",
+    "fqdn": "garage-15",
     "os": "linux",
-    "os_version": "5.4.0-1090-kvm",
-    "hostname": "garage-10",
-    "ipaddress": "192.168.122.70",
+    "os_version": "5.15.0-1095-kvm",
+    "hostname": "garage-15",
+    "ipaddress": "192.168.122.57",
     "roles": [
       "base",
       "kvm_guest",
@@ -20,6 +21,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_garage",
       "kosmos_garage::default",
@@ -30,6 +32,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -42,17 +45,17 @@
       "firewall::default"
     ],
     "platform": "ubuntu",
-    "platform_version": "20.04",
+    "platform_version": "22.04",
     "cloud": null,
     "chef_packages": {
       "chef": {
-        "version": "18.5.0",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.5.0/lib",
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "18.1.11",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.11/lib/ohai"
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
       }
     }
   },

nodes/garage-16.json

@@ -0,0 +1,65 @@
+{
+  "name": "garage-16",
+  "chef_environment": "production",
+  "normal": {
+    "knife_zero": {
+      "host": "10.1.1.153"
+    },
+    "vm_host": "leo"
+  },
+  "automatic": {
+    "fqdn": "garage-16",
+    "os": "linux",
+    "os_version": "6.8.0-106-generic",
+    "hostname": "garage-16",
+    "ipaddress": "192.168.122.182",
+    "roles": [
+      "base",
+      "kvm_guest",
+      "garage_node"
+    ],
+    "recipes": [
+      "kosmos-base",
+      "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
+      "kosmos_kvm::guest",
+      "kosmos_garage",
+      "kosmos_garage::default",
+      "kosmos_garage::firewall_rpc",
+      "kosmos_garage::firewall_apis",
+      "apt::default",
+      "timezone_iii::default",
+      "timezone_iii::debian",
+      "kosmos-base::journald_conf",
+      "kosmos-base::systemd_emails",
+      "apt::unattended-upgrades",
+      "kosmos-base::firewall",
+      "kosmos-postfix::default",
+      "postfix::default",
+      "postfix::_common",
+      "postfix::_attributes",
+      "postfix::sasl_auth",
+      "hostname::default",
+      "firewall::default"
+    ],
+    "platform": "ubuntu",
+    "platform_version": "24.04",
+    "cloud": null,
+    "chef_packages": {
+      "chef": {
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
+        "chef_effortless": null
+      },
+      "ohai": {
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
+      }
+    }
+  },
+  "run_list": [
+    "role[base]",
+    "role[kvm_guest]",
+    "role[garage_node]"
+  ]
+}

nodes/garage-2.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.40"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "garage-2",
@@ -20,6 +21,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_garage",
       "kosmos_garage::default",
@@ -30,6 +32,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",
@@ -46,13 +49,13 @@
     "cloud": null,
     "chef_packages": {
       "chef": {
-        "version": "18.3.0",
-        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.3.0/lib",
+        "version": "18.10.17",
+        "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.10.17/lib",
         "chef_effortless": null
       },
       "ohai": {
-        "version": "18.1.4",
-        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai"
+        "version": "18.2.13",
+        "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.2.13/lib/ohai"
       }
     }
   },

nodes/garage-7.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.182"
-    }
+    },
+    "vm_host": "draco"
   },
   "automatic": {
     "fqdn": "garage-7",
@@ -20,6 +21,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_garage",
       "kosmos_garage::default",
@@ -30,6 +32,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",

nodes/garage-8.json

@@ -4,7 +4,8 @@
   "normal": {
     "knife_zero": {
       "host": "10.1.1.61"
-    }
+    },
+    "vm_host": "fornax"
   },
   "automatic": {
     "fqdn": "garage-8",
@@ -20,6 +21,7 @@
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_prometheus::node_exporter",
       "kosmos_kvm::guest",
       "kosmos_garage",
       "kosmos_garage::default",
@@ -30,6 +32,7 @@
       "timezone_iii::debian",
       "ntp::default",
       "ntp::apparmor",
+      "kosmos-base::journald_conf",
       "kosmos-base::systemd_emails",
       "apt::unattended-upgrades",
       "kosmos-base::firewall",