From 5f96988f5bbd3dd3fcd4f0cbf32a5f3894ffaf84 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 1 Mar 2026 22:45:17 +0000
Subject: [PATCH] Configure blogs user directly using chef resources

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

diff --git a/cookbooks/blogs/attributes/default.rb b/cookbooks/blogs/attributes/default.rb
deleted file mode 100644
index d230b5915..000000000
--- a/cookbooks/blogs/attributes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-default[:accounts][:users][:blogs][:status] = :role
diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 026c1821f..f6f8efac8 100644
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -30,6 +30,19 @@ package %w[
   sqlite3
 ]
 
+group "blogs" do
+  gid 525
+end
+
+user "blogs" do
+  uid 525
+  gid 525
+  comment "blogs.openstreetmap.org"
+  home "/srv/blogs.openstreetmap.org"
+  shell "/usr/sbin/nologin"
+  manage_home false
+end
+
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
   group "blogs"
diff --git a/test/data_bags/accounts/blogs.json b/test/data_bags/accounts/blogs.json
deleted file mode 100644
index 20059bfda..000000000
--- a/test/data_bags/accounts/blogs.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "id": "blogs",
-  "uid": "525",
-  "comment": "Blog Aggregator",
-  "manage_home": false
-}
-- 
2.39.5