Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 36485d244b7cb9fa621cdf9f1e1673d5cfd49cfe..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
 #
-# 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
 #
-#     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,
@@ -17,16 +17,29 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
 include_recipe "apache"
-include_recipe "chef::gems"
+include_recipe "fail2ban"
+include_recipe "git"
 include_recipe "mysql"
+include_recipe "php::fpm"
 
-package "subversion"
+package %w[
+  subversion
+  php-mysql
+]
 
-package "php5"
-package "php5-mysql"
+apache_module "proxy"
+apache_module "proxy_fcgi"
+apache_module "rewrite"
 
-package "php-apc"
+fail2ban_filter "wordpress" do
+  source "https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-hard.conf"
+end
 
-apache_module "php5"
-apache_module "rewrite"
+fail2ban_jail "wordpress" do
+  filter "wordpress"
+  logpath "/var/log/auth.log"
+  ports [80, 443]
+  maxretry 6
+end