X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d37b2b50ef3a2f0a29a5a17773138d2dec5c71d2..e360831da9c643f55a1d605de2c603c6fd6c79ed:/cookbooks/wordpress/resources/site.rb

diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb
index 6fdaeb4f8..75276495b 100644
--- 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 :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
@@ -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( 'WP2FA_ENCRYPT_KEY', '#{new_resource.wp2fa_encrypt_key}');\r\n"
     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"
-    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