From: Grant Slater Date: Fri, 7 Feb 2014 01:57:33 +0000 (+0000) Subject: Add basic forum cookbook + role and apply for clifford X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3093125b06b088ec7daab3e21f75b85851a586a6 Add basic forum cookbook + role and apply for clifford --- diff --git a/cookbooks/forum/README.md b/cookbooks/forum/README.md new file mode 100644 index 000000000..205739199 --- /dev/null +++ b/cookbooks/forum/README.md @@ -0,0 +1,34 @@ +Cookbook +======== +TODO: Enter the cookbook description here. + +e.g. +This cookbook makes your favorite breakfast sandwich. + +Requirements +------------ +TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc. + +Attributes +---------- +TODO: List you cookbook attributes here. + +Usage +----- +TODO: Write usage instructions for each cookbook. + +Contributing +------------ +TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section. + +e.g. +1. Fork the repository on Github +2. Create a named feature branch (like `add_component_x`) +3. Write your change +4. Write tests for your change (if applicable) +5. Run the tests, ensuring they all pass +6. Submit a Pull Request using Github + +License and Authors +------------------- +Authors: TODO: List authors diff --git a/cookbooks/forum/metadata.rb b/cookbooks/forum/metadata.rb new file mode 100644 index 000000000..56a5a98f3 --- /dev/null +++ b/cookbooks/forum/metadata.rb @@ -0,0 +1,8 @@ +name "forum" +maintainer "OpenStreetMap Administrators" +maintainer_email "admins@openstreetmap.org" +license "Apache 2.0" +description "Installs and configures a roundup server" +long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) +version "1.0.0" +depends "apache" diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb new file mode 100644 index 000000000..58daae422 --- /dev/null +++ b/cookbooks/forum/recipes/default.rb @@ -0,0 +1,26 @@ +# +# Cookbook Name:: forum +# Recipe:: default +# +# Copyright 2014, 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 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +include_recipe "apache" + +package "php5" +package "php5-cli" +package "php-apc" + +apache_module "php5" + diff --git a/roles/clifford.rb b/roles/clifford.rb index 0776abe61..896438d0b 100644 --- a/roles/clifford.rb +++ b/roles/clifford.rb @@ -21,5 +21,6 @@ default_attributes( ) run_list( - "role[ucl-internal]" + "role[ucl-internal]", + "role[forum]" ) diff --git a/roles/forum.rb b/roles/forum.rb new file mode 100644 index 000000000..83abe0d88 --- /dev/null +++ b/roles/forum.rb @@ -0,0 +1,25 @@ +name "forum" +description "Role applied to all forum servers" + +default_attributes( + :accounts => { + :users => { + :lambertus => { :status => :administrator } + } + }, + :apache => { + :mpm => "prefork", + :timeout => 60, + :keepalive => false, + :prefork => { + :start_servers => 20, + :min_spare_servers => 20, + :max_spare_servers => 50, + :max_clients => 256, + } + } +) + +run_list( + "recipe[forum]" +)