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 de5fc4522219a9cf3b0a2a0d140f1a7d6e6f6289..a694f42b2a5b1f28b287d4a8c78e2c517257ba5d 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -17,21 +17,19 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 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"
 
 fail2ban_filter "wordpress" do
-  source "http://plugins.svn.wordpress.org/wp-fail2ban/trunk/wordpress-hard.conf"
+  source "https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-hard.conf"
 end
 
 fail2ban_jail "wordpress" do