Replace cgiirc with a form frontend for webchat.oftc.net

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 9cc4301ef3cde75ae5e0ba12cee8726df2fa928b..b72d4d1c5434fed666563c7d5e61e8c2ae0621d7 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: planet
+# Cookbook:: planet

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

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

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,13 +17,14 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "apache"

+include_recipe "munin"

 
 

-package "perl"
-package "pbzip2"
-package "osmosis"
-
-package "php-cli"
+package %w[
+  perl
+  php-cli
+]

 
 file "/etc/cron.d/planet" do
   action :delete
 
 file "/etc/cron.d/planet" do
   action :delete


@@ -97,6 +98,7 @@ end
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"

+apache_module "ratelimit"

 
 ssl_certificate "planet.openstreetmap.org" do
   domains ["planet.openstreetmap.org", "planet.osm.org"]
 
 ssl_certificate "planet.openstreetmap.org" do
   domains ["planet.openstreetmap.org", "planet.osm.org"]