Merge what remains of apache::ssl into apache::default

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

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 688dd189f09c8249ac50c286275d0376cc4a18d0..a694f42b2a5b1f28b287d4a8c78e2c517257ba5d 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -18,30 +18,23 @@
 #
 
 include_recipe "apache"
-include_recipe "chef::gems"
 include_recipe "mysql"
 
 package "subversion"
 
-package "php5"
-package "php5-mysql"
+package "php"
+package "php-mysql"
 
-package "php-apc"
-
-apache_module "php5"
+apache_module "php7.0"
 apache_module "rewrite"
 
-remote_file "/etc/fail2ban/filter.d/wordpress.conf" do
-  action :create_if_missing
-  source "http://plugins.svn.wordpress.org/wp-fail2ban/trunk/wordpress.conf"
-  owner "root"
-  group "root"
-  mode 0644
+fail2ban_filter "wordpress" do
+  source "https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-hard.conf"
 end
 
 fail2ban_jail "wordpress" do
   filter "wordpress"
   logpath "/var/log/auth.log"
-  ports 80, 443
+  ports [80, 443]
   maxretry 6
 end