From d875fab8380eeab363734233a32f711499218547 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Mar 2026 22:07:05 +0000
Subject: [PATCH] Configure apis user directly using chef resources

---
 cookbooks/dev/metadata.rb         |  1 -
 cookbooks/dev/recipes/default.rb  | 15 ++++++++++++++-
 roles/dev.rb                      |  5 +++--
 test/data_bags/accounts/apis.json |  5 -----
 4 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 test/data_bags/accounts/apis.json

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 4828c8965..f64fe9287 100644
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -6,7 +6,6 @@ description       "Installs and configures dev services"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "accounts"
 depends           "apache"
 depends           "passenger"
 depends           "chef"
diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index ff2c60b9e..8f3264635 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,7 +20,6 @@
 require "yaml"
 require "securerandom"
 
-include_recipe "accounts"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"
@@ -288,6 +287,20 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
+group "apis" do
+  gid 505
+  append true
+end
+
+user "apis" do
+  uid 505
+  gid 505
+  comment "apis.dev.openstreetmap.org"
+  home "/srv/apis.dev.openstreetmap.org"
+  shell "/usr/sbin/nologin"
+  manage_home false
+end
+
 node[:postgresql][:versions].each do |version|
   package "postgresql-#{version}-postgis-3"
 end
diff --git a/roles/dev.rb b/roles/dev.rb
index d044b6f0f..fd04b7d58 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -78,9 +78,10 @@ default_attributes(
       :twain => { :status => :user },
       :yellowbkpk => { :status => :user },
       :zander => { :status => :user },
-      :zverik => { :status => :user },
+      :zverik => { :status => :user }
+    },
+    :groups => {
       :apis => {
-        :status => :role,
         :members => [:tomh]
       }
     }
diff --git a/test/data_bags/accounts/apis.json b/test/data_bags/accounts/apis.json
deleted file mode 100644
index 44d235d52..000000000
--- a/test/data_bags/accounts/apis.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "apis",
-  "uid": "505",
-  "comment": "apis.dev.openstreetmap.org"
-}
-- 
2.39.5