Revert "Allow domain level blocks on email senders"

[chef.git] / cookbooks / wordpress / recipes / default.rb

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 2ca2b240bacdc1f8f88a70f44e3bf4d233fe5f22..d68a7e50fa42f387ec9a418057153458ded95d35 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -22,14 +22,16 @@ include_recipe "apache"
 include_recipe "fail2ban"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "fail2ban"
 include_recipe "git"
 include_recipe "mysql"

+include_recipe "php::fpm"

 
 package %w[
   subversion
 
 package %w[
   subversion

-  php

   php-mysql
   php-mysql

+  php-imagick

 ]
 
 ]
 

-apache_module "php7.2"
+apache_module "proxy"
+apache_module "proxy_fcgi"

 apache_module "rewrite"
 
 fail2ban_filter "wordpress" do
 apache_module "rewrite"
 
 fail2ban_filter "wordpress" do


@@ -42,3 +44,16 @@ fail2ban_jail "wordpress" do
   ports [80, 443]
   maxretry 6
 end
   ports [80, 443]
   maxretry 6
 end

+
+directory "/opt/wp-cli" do
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+remote_file "/opt/wp-cli/wp" do
+  source "https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"
+  owner "root"
+  group "root"
+  mode "755"
+end