From: Tom Hughes Date: Wed, 19 Sep 2018 10:48:08 +0000 (+0100) Subject: Remove unused OWL role and cookbook X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/10e095f69e2a4eb4820323ca6e350a992f551126 Remove unused OWL role and cookbook --- diff --git a/cookbooks/owl/.foodcritic b/cookbooks/owl/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/owl/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/owl/README.md b/cookbooks/owl/README.md deleted file mode 100644 index 7072e2224..000000000 --- a/cookbooks/owl/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# OWL Cookbook - -This cookbook installs and configures the OpenStreetMap Watch List service. diff --git a/cookbooks/owl/attributes/default.rb b/cookbooks/owl/attributes/default.rb deleted file mode 100644 index adf7f6852..000000000 --- a/cookbooks/owl/attributes/default.rb +++ /dev/null @@ -1 +0,0 @@ -default[:owl][:ruby] = "1.9.1" diff --git a/cookbooks/owl/metadata.rb b/cookbooks/owl/metadata.rb deleted file mode 100644 index 7eeade7c9..000000000 --- a/cookbooks/owl/metadata.rb +++ /dev/null @@ -1,10 +0,0 @@ -name "owl" -maintainer "OpenStreetMap Administrators" -maintainer_email "admins@openstreetmap.org" -license "Apache-2.0" -description "Installs and configures OWL servers" -long_description IO.read(File.join(File.dirname(__FILE__), "README.md")) -version "1.0.0" -supports "ubuntu" -depends "apache" -depends "postgresql" diff --git a/cookbooks/owl/recipes/default.rb b/cookbooks/owl/recipes/default.rb deleted file mode 100644 index 302050e67..000000000 --- a/cookbooks/owl/recipes/default.rb +++ /dev/null @@ -1,132 +0,0 @@ -# -# Cookbook Name:: owl -# 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" -include_recipe "postgresql" - -package "python" -package "python-psycopg2" - -package "libxslt-dev" - -package "ruby#{node[:owl][:ruby]}" -package "ruby#{node[:owl][:ruby]}-dev" -package "rubygems#{node[:owl][:ruby]}" -package "irb#{node[:owl][:ruby]}" - -gem_package "bundler#{node[:owl][:ruby]}" do - package_name "bundler" - gem_binary "gem#{node[:owl][:ruby]}" - options "--format-executable" -end - -apache_module "passenger" do - conf "passenger.conf.erb" -end - -munin_plugin "passenger_memory" -munin_plugin "passenger_processes" -munin_plugin "passenger_queues" -munin_plugin "passenger_requests" - -postgresql_user "tomh" do - cluster "9.1/main" - superuser true -end - -postgresql_user "matt" do - cluster "9.1/main" - superuser true -end - -postgresql_user "ppawel" do - cluster "9.1/main" - superuser true -end - -postgresql_user "owl" do - cluster "9.1/main" -end - -postgresql_database "owl" do - cluster "9.1/main" - owner "owl" -end - -postgresql_munin "owl" do - cluster "9.1/main" - database "owl" -end - -# grant select on changeset_tiles to owl; -# grant select on geometry_columns to owl; -# grant select on changesets to owl; -# grant select on users to owl; - -directory "/srv/owl.openstreetmap.org" do - owner "owl" - group "owl" - mode 0o2775 -end - -file "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt" do - action :nothing -end - -execute "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile" do - action :nothing - command "bundle#{node[:owl][:ruby]} install" - cwd "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails" - user "root" - group "root" - notifies :touch, "file[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt]" -end - -git "/srv/owl.openstreetmap.org/openstreetmap-watch-list" do - action :sync - repository "git://github.com/ppawel/openstreetmap-watch-list.git" - revision "owl.osm.org" - user "owl" - group "owl" - notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]" -end - -directory "srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp" do - owner "owl" - group "owl" -end - -file "srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/config/environment.rb" do - owner "owl" - group "owl" -end - -template "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/config/database.yml" do - source "database.yml.erb" - owner "owl" - group "owl" - mode 0o664 - notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]" - only_if { node[:postgresql][:clusters][:"9.1/main"] } -end - -apache_site "owl.openstreetmap.org" do - template "apache.erb" - variables :aliases => ["owl.osm.org"] -end diff --git a/cookbooks/owl/templates/default/apache.erb b/cookbooks/owl/templates/default/apache.erb deleted file mode 100644 index d5af8e1d5..000000000 --- a/cookbooks/owl/templates/default/apache.erb +++ /dev/null @@ -1,19 +0,0 @@ -# DO NOT EDIT - This file is being maintained by Chef - - - ServerName <%= @name %> -<% @aliases.each do |alias_name| -%> - ServerAlias <%= alias_name %> -<% end -%> - ServerAdmin webmaster@openstreetmap.org - - DocumentRoot /srv/<%= @name %>/openstreetmap-watch-list/rails/public - - RailsEnv production - PassengerAppGroupName owl - - SetOutputFilter DEFLATE - - CustomLog /var/log/apache2/<%= @name %>-access.log combined - ErrorLog /var/log/apache2/<%= @name %>-error.log - diff --git a/cookbooks/owl/templates/default/database.yml.erb b/cookbooks/owl/templates/default/database.yml.erb deleted file mode 100644 index 27db9c042..000000000 --- a/cookbooks/owl/templates/default/database.yml.erb +++ /dev/null @@ -1,13 +0,0 @@ -# DO NOT EDIT - This file is being maintained by Chef - -production: - adapter: postgresql - port: <%= node[:postgresql][:clusters]["9.1/main"][:port] %> - database: owl - encoding: utf8 - -development: - adapter: postgresql - port: <%= node[:postgresql][:clusters]["9.1/main"][:port] %> - database: owl - encoding: utf8 diff --git a/cookbooks/owl/templates/default/passenger.conf.erb b/cookbooks/owl/templates/default/passenger.conf.erb deleted file mode 100644 index 1bf352cac..000000000 --- a/cookbooks/owl/templates/default/passenger.conf.erb +++ /dev/null @@ -1,7 +0,0 @@ -# DO NOT EDIT - This file is being maintained by Chef - - - PassengerRoot /usr - PassengerRuby /usr/bin/ruby<%= node[:owl][:ruby] %> - PassengerUseGlobalQueue on - diff --git a/roles/owl.rb b/roles/owl.rb deleted file mode 100644 index 08d7b2f87..000000000 --- a/roles/owl.rb +++ /dev/null @@ -1,55 +0,0 @@ -name "owl" -description "Role applied to all OWL servers" - -default_attributes( - :accounts => { - :users => { - :yellowbkpk => { :status => :user }, - :ppawel => { :status => :user }, - :owl => { - :status => :role, - :members => [:yellowbkpk, :ppawel] - } - }, - :groups => { - :adm => { - :members => [:yellowbkpk, :ppawel] - } - } - }, - :apache => { - :mpm => "event" - }, - :apt => { - :sources => ["brightbox-ruby-ng", "ubuntugis-stable", "ubuntugis-unstable"] - }, - :postgresql => { - :versions => ["9.1"], - :settings => { - :defaults => { - :fsync => "off", - :checkpoint_segments => "30", - :max_wal_size => "1440MB", - :checkpoint_completion_target => "0.9", - :random_page_cost => "2.0", - :log_min_duration_statement => "3000" - }, - "9.1" => { - :port => "5433" - } - } - }, - :sysctl => { - :postgres => { - :comment => "Increase shared memory for postgres", - :parameters => { - "kernel.shmmax" => 16 * 1024 * 1024 * 1024, - "kernel.shmall" => 16 * 1024 * 1024 * 1024 / 4096 - } - } - } -) - -run_list( - "recipe[owl]" -)