From 82c43f49686180c81790d40a8707e3d6b44a8a35 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Wed, 5 Feb 2014 18:19:06 +0000 Subject: [PATCH] Add placeholder roundup cookbook & role and apply to ascalon --- cookbooks/roundup/README.md | 34 ++++++++++++++++++++++++++++ cookbooks/roundup/metadata.rb | 8 +++++++ cookbooks/roundup/recipes/default.rb | 20 ++++++++++++++++ roles/ascalon.rb | 3 ++- roles/roundup.rb | 6 +++++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 cookbooks/roundup/README.md create mode 100644 cookbooks/roundup/metadata.rb create mode 100644 cookbooks/roundup/recipes/default.rb create mode 100644 roles/roundup.rb diff --git a/cookbooks/roundup/README.md b/cookbooks/roundup/README.md new file mode 100644 index 000000000..205739199 --- /dev/null +++ b/cookbooks/roundup/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/roundup/metadata.rb b/cookbooks/roundup/metadata.rb new file mode 100644 index 000000000..2058133d7 --- /dev/null +++ b/cookbooks/roundup/metadata.rb @@ -0,0 +1,8 @@ +name "roundup" +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/roundup/recipes/default.rb b/cookbooks/roundup/recipes/default.rb new file mode 100644 index 000000000..25eb0e3c0 --- /dev/null +++ b/cookbooks/roundup/recipes/default.rb @@ -0,0 +1,20 @@ +# +# Cookbook Name:: roundup +# Recipe:: default +# +# 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 +# +# 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" + diff --git a/roles/ascalon.rb b/roles/ascalon.rb index 87b9ca26c..61a72bb2c 100644 --- a/roles/ascalon.rb +++ b/roles/ascalon.rb @@ -26,5 +26,6 @@ default_attributes( ) run_list( - "role[ucl-internal]" + "role[ucl-internal]", + "role[roundup]" ) diff --git a/roles/roundup.rb b/roles/roundup.rb new file mode 100644 index 000000000..ec099e646 --- /dev/null +++ b/roles/roundup.rb @@ -0,0 +1,6 @@ +name "roundup" +description "Role applied to all roundup servers" + +run_list( + "recipe[roundup]" +) -- 2.39.5