From 7dbc9a4c1f330d7989dc28ac4035826255f8ac55 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 1 Mar 2026 22:25:47 +0000
Subject: [PATCH] Configure serverinfo user directly using chef resources

---
 cookbooks/serverinfo/attributes/default.rb |  1 -
 cookbooks/serverinfo/recipes/default.rb    | 13 +++++++++++++
 test/data_bags/accounts/serverinfo.json    |  6 ------
 3 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 cookbooks/serverinfo/attributes/default.rb
 delete mode 100644 test/data_bags/accounts/serverinfo.json

diff --git a/cookbooks/serverinfo/attributes/default.rb b/cookbooks/serverinfo/attributes/default.rb
deleted file mode 100644
index bd45555d1..000000000
--- a/cookbooks/serverinfo/attributes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-default[:accounts][:users][:serverinfo][:status] = :role
diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index c455ddc12..3be7beb07 100644
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -31,6 +31,19 @@ package %w[
   pkg-config
 ]
 
+group "serverinfo" do
+  gid 534
+end
+
+user "serverinfo" do
+  uid 534
+  gid 534
+  comment "hardware.openstreetmap.org"
+  home "/srv/hardware.openstreetmap.org"
+  shell "/usr/sbin/nologin"
+  manage_home false
+end
+
 directory "/srv/hardware.openstreetmap.org" do
   owner "serverinfo"
   group "serverinfo"
diff --git a/test/data_bags/accounts/serverinfo.json b/test/data_bags/accounts/serverinfo.json
deleted file mode 100644
index 2b01af603..000000000
--- a/test/data_bags/accounts/serverinfo.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": "serverinfo",
-  "uid": "534",
-  "comment": "hardware.openstreetmap.org",
-  "manage_home": false
-}
-- 
2.39.5