Sort ignored addresses

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 6cfde3722739edf9c9bc32a1896eaa8143f004fb..89eb26d57462d16fcd03b74deed59d22b8df5621 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -17,27 +17,17 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "mysql"
 include_recipe "git"
 
 include_recipe "mysql"
 include_recipe "git"
 

-if node[:lsb][:release].to_f >= 16.04
-  package "php"
-  package "php-cli"
-  package "php-curl"
-  package "php-mysql"
-  package "php-gd"
-
-  apache_module "php7.0"
-else
-  package "php5"
-  package "php5-cli"
-  package "php5-curl"
-  package "php5-mysql"
-  package "php5-gd"
-
-  apache_module "php5"
-end
+package "php"
+package "php-cli"
+package "php-curl"
+package "php-mysql"
+package "php-gd"
+
+apache_module "php7.0"

 
 apache_module "headers"
 
 
 apache_module "headers"