Try and ensure tile server use an integer number of listen buckets

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

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index b8db4b29af8f1fdfb16fd6c0386e7400bbce49a2..d68a7e50fa42f387ec9a418057153458ded95d35 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,22 +17,25 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
-include_recipe "chef::gems"
+include_recipe "accounts"
+include_recipe "apache"
+include_recipe "fail2ban"
+include_recipe "git"

 include_recipe "mysql"
 include_recipe "mysql"

+include_recipe "php::fpm"

 
 

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

 
 

-package "php5"
-package "php5-mysql"
-
-package "php-apc"
-
-apache_module "php5"
+apache_module "proxy"
+apache_module "proxy_fcgi"

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

-  source "http://plugins.svn.wordpress.org/wp-fail2ban/trunk/wordpress.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


@@ -41,3 +44,16 @@ fail2ban_jail "wordpress" do
   ports [80, 443]
   maxretry 6
 end
   ports [80, 443]
   maxretry 6
 end

+
+directory "/opt/wp-cli" do
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+remote_file "/opt/wp-cli/wp" do
+  source "https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"
+  owner "root"
+  group "root"
+  mode "755"
+end