From e360831da9c643f55a1d605de2c603c6fd6c79ed Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Fri, 28 Jul 2023 20:19:55 +0100
Subject: [PATCH] wordpress: run wp-cli tasks as www-data to match runtime

Fixes: https://github.com/openstreetmap/operations/issues/914
---
 cookbooks/wordpress/resources/plugin.rb | 8 ++++----
 cookbooks/wordpress/resources/site.rb   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index fee9fcbca..374e89284 100644
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -65,8 +65,8 @@ action :create do
 
   execute "wp-cli plugin activate #{new_resource.plugin}" do
     command "/opt/wp-cli/wp --path=#{site_directory} plugin activate #{new_resource.plugin}"
-    user node[:wordpress][:user]
-    group node[:wordpress][:group]
+    user "www-data"
+    group "www-data"
     not_if "/opt/wp-cli/wp --path=#{site_directory} plugin is-active #{new_resource.plugin}"
   end
 end
@@ -74,8 +74,8 @@ end
 action :delete do
   execute "wp-cli plugin deactivate #{new_resource.plugin}" do
     command "/opt/wp-cli/wp --path=#{site_directory} plugin deactivate #{new_resource.plugin}"
-    user node[:wordpress][:user]
-    group node[:wordpress][:group]
+    user "www-data"
+    group "www-data"
     only_if "/opt/wp-cli/wp --path=#{site_directory} plugin is-active #{new_resource.plugin}"
   end
 
diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 69767e67a..75276495b 100644
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -147,8 +147,8 @@ action :create do
   # Setup wordpress database and create admin user with random password
   execute "wp core install" do
     command "/opt/wp-cli/wp --path=#{site_directory} core install --url=#{new_resource.site} --title='#{new_resource.title}' --admin_user=#{new_resource.admin_user} --admin_email=#{new_resource.admin_email} --skip-email"
-    user node[:wordpress][:user]
-    group node[:wordpress][:group]
+    user "www-data"
+    group "www-data"
     only_if { ::File.exist?("#{site_directory}/wp-config.php") }
     not_if "/opt/wp-cli/wp  --path=#{site_directory} core is-installed"
   end
-- 
2.43.2