From 89cd974689bc9c2d59c57de26accad377bfb98b0 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Mar 2026 16:42:46 +0000
Subject: [PATCH] Configure wordpress user directly using chef resources

---
 cookbooks/wordpress/attributes/default.rb |  3 ---
 cookbooks/wordpress/metadata.rb           |  1 -
 cookbooks/wordpress/recipes/default.rb    | 15 ++++++++++++++-
 roles/blog-staging.rb                     |  5 +++--
 test/data_bags/accounts/wordpress.json    |  5 -----
 5 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 test/data_bags/accounts/wordpress.json

diff --git a/cookbooks/wordpress/attributes/default.rb b/cookbooks/wordpress/attributes/default.rb
index 9233459dc..3b1e62151 100644
--- a/cookbooks/wordpress/attributes/default.rb
+++ b/cookbooks/wordpress/attributes/default.rb
@@ -1,6 +1,3 @@
-# Enable the "wordpress" role
-default[:accounts][:users][:wordpress][:status] = :role
-
 # Set wordpress defaults
 default[:wordpress][:user] = "wordpress"
 default[:wordpress][:group] = "wordpress"
diff --git a/cookbooks/wordpress/metadata.rb b/cookbooks/wordpress/metadata.rb
index 7898910cc..12aa99769 100644
--- a/cookbooks/wordpress/metadata.rb
+++ b/cookbooks/wordpress/metadata.rb
@@ -6,7 +6,6 @@ description       "Installs and configures Wordpress"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "accounts"
 depends           "apache"
 depends           "chef"
 depends           "fail2ban"
diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 2849e592f..e8ca53456 100644
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "accounts"
 include_recipe "apache"
 include_recipe "fail2ban"
 include_recipe "git"
@@ -34,6 +33,20 @@ package %w[
   php-xml
 ]
 
+group "wordpress" do
+  gid 516
+  append true
+end
+
+user "wordpress" do
+  uid 516
+  gid 516
+  comment "Wordpress"
+  home "/"
+  shell "/usr/sbin/nologin"
+  manage_home false
+end
+
 apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "rewrite"
diff --git a/roles/blog-staging.rb b/roles/blog-staging.rb
index bafdf6227..f2b719815 100644
--- a/roles/blog-staging.rb
+++ b/roles/blog-staging.rb
@@ -4,9 +4,10 @@ description "Role applied to staging blog servers"
 default_attributes(
   :accounts => {
     :users => {
-      :mikel => { :status => :administrator },
+      :mikel => { :status => :administrator }
+    },
+    :groups => {
       :wordpress => {
-        :status => :role,
         :members => [:mikel]
       }
     },
diff --git a/test/data_bags/accounts/wordpress.json b/test/data_bags/accounts/wordpress.json
deleted file mode 100644
index a0815197a..000000000
--- a/test/data_bags/accounts/wordpress.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "wordpress",
-  "uid": "516",
-  "comment": "Wordpress"
-}
-- 
2.39.5