Remove roles for fuchur, glaedr, gorwen, idris and lockheed

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

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 9c9bc7213e8ccc7935efedbfbd71b39bf7f1f26e..73f6f353e4303f32974dcdba471bfa66e99c04fa 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: wordpress
+# Cookbook:: wordpress

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,16 +17,20 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "apache"

+include_recipe "fail2ban"
+include_recipe "git"

 include_recipe "mysql"
 include_recipe "mysql"

+include_recipe "php::fpm"

 
 package %w[
   subversion
 
 package %w[
   subversion

-  php

   php-mysql
 ]
 
   php-mysql
 ]
 

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

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