wordpress: run wp-cli tasks as www-data to match runtime

[chef.git] / cookbooks / wordpress / resources / site.rb

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index cebd7b26f2894ccc315b21fb8bc0f510b3ba108a..75276495b445850d039bfa7161d091470b91af3a 100644 (file)
--- a/cookbooks/wordpress/resources/site.rb
+++ b/cookbooks/wordpress/resources/site.rb
@@ -33,6 +33,7 @@ property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => [:create]
 property :database_password, :kind_of => String, :required => [:create]
 property :database_prefix, :kind_of => String, :default => "wp_"
 property :database_user, :kind_of => String, :required => [:create]
 property :database_password, :kind_of => String, :required => [:create]
 property :database_prefix, :kind_of => String, :default => "wp_"

+property :wp2fa_encrypt_key, :kind_of => String, :required => true

 property :urls, :kind_of => Hash, :default => {}
 property :fpm_max_children, :kind_of => Integer, :default => 10
 property :fpm_start_servers, :kind_of => Integer, :default => 4
 property :urls, :kind_of => Hash, :default => {}
 property :fpm_max_children, :kind_of => Integer, :default => 10
 property :fpm_start_servers, :kind_of => Integer, :default => 4


@@ -108,6 +109,7 @@ action :create do
       line += "define( 'WP_FAIL2BAN_SITE_HEALTH_SKIP_FILTERS', true);\r\n"
       line += "define( 'WP_ENVIRONMENT_TYPE', 'production');\r\n"
       line += "define( 'WP_MEMORY_LIMIT', '128M');\r\n"
       line += "define( 'WP_FAIL2BAN_SITE_HEALTH_SKIP_FILTERS', true);\r\n"
       line += "define( 'WP_ENVIRONMENT_TYPE', 'production');\r\n"
       line += "define( 'WP_MEMORY_LIMIT', '128M');\r\n"

+      line += "define( 'WP2FA_ENCRYPT_KEY', '#{new_resource.wp2fa_encrypt_key}');\r\n"

     end
 
     line
     end
 
     line


@@ -145,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"
   # 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
     only_if { ::File.exist?("#{site_directory}/wp-config.php") }
     not_if "/opt/wp-cli/wp  --path=#{site_directory} core is-installed"
   end


@@ -189,22 +191,6 @@ action :create do
     reload_apache false
   end
 
     reload_apache false
   end
 

-  script "#{site_directory}/wp-content/plugins/wp-fail2ban" do
-    action :nothing
-    interpreter "php"
-    cwd site_directory
-    user "wordpress"
-    code <<-WP_FAIL2BAN
-    <?php
-    @include "wp-config.php";
-    @include_once "wp-includes/functions.php";
-    @include_once "wp-admin/includes/plugin.php";
-    activate_plugin("wp-fail2ban/wp-fail2ban.php", '', false, false);
-    ?>
-    WP_FAIL2BAN
-    subscribes :run, "wordpress_plugin[wp-fail2ban]"
-  end
-

   wordpress_plugin "wp-2fa" do
     site new_resource.site
     reload_apache false
   wordpress_plugin "wp-2fa" do
     site new_resource.site
     reload_apache false