From 2a7d30a22b2804a233a2b76247afc90facd34ebf Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 10 Jun 2019 21:51:40 +0100 Subject: [PATCH] Remove gpximport role and recipe --- cookbooks/web/recipes/gpx.rb | 94 ------------------------------------ roles/web-gpximport.rb | 7 --- 2 files changed, 101 deletions(-) delete mode 100644 cookbooks/web/recipes/gpx.rb delete mode 100644 roles/web-gpximport.rb diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb deleted file mode 100644 index 370b3113f..000000000 --- a/cookbooks/web/recipes/gpx.rb +++ /dev/null @@ -1,94 +0,0 @@ -# -# Cookbook Name:: web -# Recipe:: gpx -# -# 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. -# 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 "web::base" - -db_passwords = data_bag_item("db", "passwords") - -package %w[ - gcc - make - pkg-config - libarchive-dev - libbz2-dev - libexpat1-dev - libgd-dev - libmemcached-dev - libpq-dev - zlib1g-dev -] - -gpx_directory = "#{node[:web][:base_directory]}/gpx-import" -pid_directory = node[:web][:pid_directory] -log_directory = node[:web][:log_directory] - -execute "gpx-import-build" do - action :nothing - command "make DB=postgres" - cwd "#{gpx_directory}/src" - user "rails" - group "rails" -end - -git gpx_directory do - action :sync - repository "https://git.openstreetmap.org/public/gpx-import.git" - revision "live" - user "rails" - group "rails" - notifies :run, "execute[gpx-import-build]", :immediate -end - -systemd_service "gpx-import" do - description "GPX Import Daemon" - after "network.target" - type "forking" - environment_file "GPX_SLEEP_TIME" => "40", - "GPX_PATH_TRACES" => "/store/rails/gpx/traces", - "GPX_PATH_IMAGES" => "/store/rails/gpx/images", - "GPX_PATH_TEMPLATES" => "#{gpx_directory}/templates/", - "GPX_PGSQL_HOST" => node[:web][:database_host], - "GPX_PGSQL_USER" => "gpximport", - "GPX_PGSQL_PASS" => db_passwords["gpximport"], - "GPX_PGSQL_DB" => "openstreetmap", - "GPX_LOG_FILE" => "#{log_directory}/gpx-import.log", - "GPX_PID_FILE" => "#{pid_directory}/gpx-import.pid", - "GPX_MAIL_SENDER" => "bounces@openstreetmap.org" - user "rails" - exec_start "#{gpx_directory}/src/gpx-import" - exec_reload "/bin/kill -HUP $MAINPID" - private_tmp true - protect_system "full" - protect_home true - restart "on-failure" - pid_file "#{pid_directory}/gpx-import.pid" -end - -if %w[database_offline database_readonly gpx_offline].include?(node[:web][:status]) - service "gpx-import" do - action :stop - end -else - service "gpx-import" do - action [:enable, :start] - supports :restart => true, :reload => true - subscribes :restart, "execute[gpx-import-build]" - subscribes :restart, "systemd_service[gpx-import]" - end -end diff --git a/roles/web-gpximport.rb b/roles/web-gpximport.rb deleted file mode 100644 index 95ad87025..000000000 --- a/roles/web-gpximport.rb +++ /dev/null @@ -1,7 +0,0 @@ -name "web-gpximport" -description "Role applied to all web/api GPX import servers" - -run_list( - "role[web]", - "recipe[web::gpx]" -) -- 2.43.2