From 9e7ff8d4f5ec9a1a61d98e721247e76df954831d Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Mar 2026 17:00:48 +0000
Subject: [PATCH] Configure wiki user directly using chef resources

---
 cookbooks/mediawiki/attributes/default.rb |  3 ---
 cookbooks/mediawiki/metadata.rb           |  1 -
 cookbooks/mediawiki/recipes/default.rb    | 15 ++++++++++++++-
 roles/wiki.rb                             |  5 -----
 test/data_bags/accounts/wiki.json         |  7 -------
 5 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 test/data_bags/accounts/wiki.json

diff --git a/cookbooks/mediawiki/attributes/default.rb b/cookbooks/mediawiki/attributes/default.rb
index 7a043d559..b8056e4b8 100644
--- a/cookbooks/mediawiki/attributes/default.rb
+++ b/cookbooks/mediawiki/attributes/default.rb
@@ -1,6 +1,3 @@
-# Default to enabling the "wiki" role
-default[:accounts][:users][:wiki][:status] = :role
-
 # Set mediawiki defaults
 default[:mediawiki][:user] = "wiki"
 default[:mediawiki][:group] = "wiki"
diff --git a/cookbooks/mediawiki/metadata.rb b/cookbooks/mediawiki/metadata.rb
index e3a159c80..2c491082c 100644
--- a/cookbooks/mediawiki/metadata.rb
+++ b/cookbooks/mediawiki/metadata.rb
@@ -6,7 +6,6 @@ description       "Installs and configures mediawiki"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "accounts"
 depends           "apache"
 depends           "apt"
 depends           "chef"
diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 6e10bacb1..93ded2b5f 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "accounts"
 include_recipe "apache"
 include_recipe "apt"
 include_recipe "git"
@@ -72,6 +71,20 @@ package %w[
 # Mediawiki packages for SyntaxHighight support
 package "python3-pygments"
 
+group "wiki" do
+  gid 503
+  append true
+end
+
+user "wiki" do
+  uid 503
+  gid 503
+  comment "MediaWiki"
+  home "/"
+  shell "/usr/sbin/nologin"
+  manage_home false
+end
+
 link "/etc/php/#{node[:php][:version]}/fpm/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end
diff --git a/roles/wiki.rb b/roles/wiki.rb
index 6e6973390..49e91f9c8 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -2,11 +2,6 @@ name "wiki"
 description "Role applied to all wiki servers"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :wiki => { :status => :role }
-    }
-  },
   :apache => {
     :mpm => "event",
     :timeout => 30,
diff --git a/test/data_bags/accounts/wiki.json b/test/data_bags/accounts/wiki.json
deleted file mode 100644
index 0ee9618c2..000000000
--- a/test/data_bags/accounts/wiki.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "id": "wiki",
-  "uid": "555",
-  "comment": "wiki.openstreetmap.org",
-  "home": "/opt/wiki",
-  "manage_home": false
-}
-- 
2.39.5