X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a08c8d97d5cd3666799fb3bef14618d4c7c23398..bad5762eecf43cd8cc5f6a55b9262378a3851881:/cookbooks/wordpress/resources/site.rb diff --git a/cookbooks/wordpress/resources/site.rb b/cookbooks/wordpress/resources/site.rb index 1d419c14e..1e3417188 100644 --- a/cookbooks/wordpress/resources/site.rb +++ b/cookbooks/wordpress/resources/site.rb @@ -92,14 +92,17 @@ action :create do line.gsub!(/('LOGGED_IN_SALT', *)'put your unique phrase here'/, "\\1'#{logged_in_salt}'") line.gsub!(/('NONCE_SALT', *)'put your unique phrase here'/, "\\1'#{nonce_salt}'") - if line =~ /define\('WP_DEBUG'/ - line += "\n" - line += "/**\n" - line += " * Don't allow file editing.\n" - line += " */\n" - line += "define('DISALLOW_FILE_EDIT', true);\n" - line += "define('FORCE_SSL_LOGIN', true);\n" - line += "define('FORCE_SSL_ADMIN', true);\n" + if line =~ /Add any custom values between this line/ + line += "\r\n" + line += "/**\r\n" + line += " * Don't allow file editing.\r\n" + line += " */\r\n" + line += "define( 'DISALLOW_FILE_EDIT', true);\r\n" + line += "define( 'DISALLOW_FILE_MODS', true);\r\n" + line += "define( 'AUTOMATIC_UPDATER_DISABLED', true);\r\n" + line += "define( 'FORCE_SSL_LOGIN', true);\r\n" + line += "define( 'FORCE_SSL_ADMIN', true);\r\n" + line += "define( 'WP_FAIL2BAN_SITE_HEALTH_SKIP_FILTERS', true);\r\n" end line @@ -215,8 +218,8 @@ action :delete do end action_class do - include Chef::Mixin::EditFile - include Chef::Mixin::PersistentToken + include OpenStreetMap::Mixin::EditFile + include OpenStreetMap::Mixin::PersistentToken def site_directory new_resource.directory || "/srv/#{new_resource.site}"