From: Tom Hughes Date: Fri, 10 Aug 2018 21:26:03 +0000 (+0100) Subject: Remove yournavigation role and cookbook X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6c93d88605e6f37d3b17b7dc79d0bc11b3925715 Remove yournavigation role and cookbook --- diff --git a/cookbooks/yournavigation/.foodcritic b/cookbooks/yournavigation/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/yournavigation/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/yournavigation/README.md b/cookbooks/yournavigation/README.md deleted file mode 100644 index 1e4a20358..000000000 --- a/cookbooks/yournavigation/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# yournavigation cookbook - -This cookbook builds and environment suitable for running gosmore as part of the -[YOURS](https://wiki.openstreetmap.org/wiki/YOURS) routing service. - -Note that the installation and configuration of gosmore itself is not covered by the cookbook. diff --git a/cookbooks/yournavigation/metadata.rb b/cookbooks/yournavigation/metadata.rb deleted file mode 100644 index f56c80310..000000000 --- a/cookbooks/yournavigation/metadata.rb +++ /dev/null @@ -1,9 +0,0 @@ -name "yournavigation" -maintainer "OpenStreetMap Administrators" -maintainer_email "admins@openstreetmap.org" -license "Apache-2.0" -description "Installs and configures yournavigation servers" -long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) -version "1.0.0" -supports "ubuntu" -depends "apache" diff --git a/cookbooks/yournavigation/recipes/default.rb b/cookbooks/yournavigation/recipes/default.rb deleted file mode 100644 index c3b249a5e..000000000 --- a/cookbooks/yournavigation/recipes/default.rb +++ /dev/null @@ -1,49 +0,0 @@ -# -# Cookbook Name:: yournavigation -# Recipe:: default -# -# Copyright 2012, 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 -# -# 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, -# 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 %w[ - php - php-cli - php-apcu -] - -# Required for osmosis -package "default-jre-headless" - -# Required for building gosmore -package %w[ - build-essential - libxml2-dev - libgtk2.0-dev - subversion - libcurl4-gnutls-dev - libgps-dev - libcurl4 - buffer - git - cmake - libqt4-dev - qt4-dev-tools - qt4-linguist-tools - libicu-dev -] - -apache_module "php7.2" diff --git a/roles/sarel.rb b/roles/sarel.rb index b535374d7..cc9a3fd12 100644 --- a/roles/sarel.rb +++ b/roles/sarel.rb @@ -28,7 +28,6 @@ default_attributes( run_list( "role[ucl]", "role[hp-g5]", - "role[yournavigation]", "role[chef-server]", "role[chef-repository]", "role[letsencrypt]", diff --git a/roles/yournavigation.rb b/roles/yournavigation.rb deleted file mode 100644 index 65334df85..000000000 --- a/roles/yournavigation.rb +++ /dev/null @@ -1,25 +0,0 @@ -name "yournavigation" -description "Role applied to all yournavigation 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_request_workers => 256 - } - } -) - -run_list( - "recipe[yournavigation]" -)