Merge remote-tracking branch 'github/pull/169'

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

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 847924d4be26ffb9e909f77aec13e49a4a2ddb8b..8a48e8863d8e46646808e4ebe08ed364c2502151 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,22 +17,20 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
-include_recipe "chef::gems"
+include_recipe "apache"

 include_recipe "mysql"
 
 include_recipe "mysql"
 

-package "subversion"
+package %w[
+  subversion
+  php
+  php-mysql
+]

 
 

-package "php5"
-package "php5-mysql"
-
-package "php-apc"
-
-apache_module "php5"
+apache_module "php7.2"

 apache_module "rewrite"
 
 fail2ban_filter "wordpress" do
 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
 end
 
 fail2ban_jail "wordpress" do