From 088103facf690104d894c931ebf836222875cb7a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Mar 2026 08:57:04 +0000
Subject: [PATCH] Configure taginfo user directly using chef resources

---
 cookbooks/taginfo/attributes/default.rb |  2 --
 cookbooks/taginfo/metadata.rb           |  1 -
 cookbooks/taginfo/recipes/default.rb    | 14 +++++++++++++-
 roles/taginfo.rb                        |  4 +++-
 test/data_bags/accounts/taginfo.json    |  6 ------
 5 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 test/data_bags/accounts/taginfo.json

diff --git a/cookbooks/taginfo/attributes/default.rb b/cookbooks/taginfo/attributes/default.rb
index 266ac250a..c7098b77b 100644
--- a/cookbooks/taginfo/attributes/default.rb
+++ b/cookbooks/taginfo/attributes/default.rb
@@ -1,3 +1 @@
 default[:taginfo][:sites] = []
-
-default[:accounts][:users][:taginfo][:status] = :role
diff --git a/cookbooks/taginfo/metadata.rb b/cookbooks/taginfo/metadata.rb
index 90517c121..8773decd9 100644
--- a/cookbooks/taginfo/metadata.rb
+++ b/cookbooks/taginfo/metadata.rb
@@ -6,7 +6,6 @@ description       "Installs and configures taginfo"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "accounts"
 depends           "apache"
 depends           "git"
 depends           "passenger"
diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 1a6f77518..13e83df55 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -19,7 +19,6 @@
 
 require "json"
 
-include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "passenger"
@@ -27,6 +26,19 @@ include_recipe "planet::current"
 include_recipe "prometheus"
 include_recipe "ruby"
 
+group "taginfo" do
+  gid 520
+end
+
+user "taginfo" do
+  uid 520
+  gid 520
+  comment "taginfo.openstreetmap.org"
+  home "/srv/taginfo.openstreetmap.org"
+  shell "/usr/sbin/nologin"
+  manage_home false
+end
+
 package %w[
   libsqlite3-dev
   zlib1g-dev
diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index 9b8227957..afdd72635 100644
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -6,7 +6,9 @@ default_attributes(
     :users => {
       :jochen => {
         :status => :administrator
-      },
+      }
+    },
+    :groups => {
       :taginfo => {
         :members => [:jochen, :tomh]
       }
diff --git a/test/data_bags/accounts/taginfo.json b/test/data_bags/accounts/taginfo.json
deleted file mode 100644
index b74e3b095..000000000
--- a/test/data_bags/accounts/taginfo.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": "taginfo",
-  "uid": "520",
-  "comment": "Taginfo",
-  "manage_home": false
-}
-- 
2.39.5