From: Tom Hughes <tom@compton.nu>
Date: Sat, 15 Sep 2018 11:49:50 +0000 (+0100)
Subject: Convert cplanet to be a recipe in the planet cookbook
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/df64329b76f7afa6f695ecdc1a30d86bc9fa4182

Convert cplanet to be a recipe in the planet cookbook
---

diff --git a/cookbooks/cplanet/.foodcritic b/cookbooks/cplanet/.foodcritic
deleted file mode 100644
index 0c118ec61..000000000
--- a/cookbooks/cplanet/.foodcritic
+++ /dev/null
@@ -1,5 +0,0 @@
-~FC001
-~FC064
-~FC065
-~FC066
-~FC071
diff --git a/cookbooks/cplanet/README.md b/cookbooks/cplanet/README.md
deleted file mode 100644
index 59e2ccbef..000000000
--- a/cookbooks/cplanet/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# cplanet cookbook
-
-This cookbook installs a current planet file and keeps a local copy up-to-date.
-It is the basis for other services that need a current planet file.
-
diff --git a/cookbooks/cplanet/attributes/default.rb b/cookbooks/cplanet/attributes/default.rb
deleted file mode 100644
index e1e8c3836..000000000
--- a/cookbooks/cplanet/attributes/default.rb
+++ /dev/null
@@ -1 +0,0 @@
-default[:cplanet][:jobs] = {}
diff --git a/cookbooks/cplanet/metadata.rb b/cookbooks/cplanet/metadata.rb
deleted file mode 100644
index 2ee79ff07..000000000
--- a/cookbooks/cplanet/metadata.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-name              "cplanet"
-maintainer        "OpenStreetMap Administrators"
-maintainer_email  "admins@openstreetmap.org"
-license           "Apache-2.0"
-description       "Installs and keeps current planet file"
-long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
-version           "1.0.0"
-supports          "ubuntu"
diff --git a/cookbooks/planet/attributes/default.rb b/cookbooks/planet/attributes/default.rb
index 649d9b399..e888b5677 100644
--- a/cookbooks/planet/attributes/default.rb
+++ b/cookbooks/planet/attributes/default.rb
@@ -2,3 +2,5 @@ default[:planet][:dump][:xml_directory] = "/store/planet/planet"
 default[:planet][:dump][:xml_history_directory] = "/store/planet/planet/full-history"
 default[:planet][:dump][:pbf_directory] = "/store/planet/pbf"
 default[:planet][:dump][:pbf_history_directory] = "/store/planet/pbf/full-history"
+
+default[:planet][:current][:jobs] = {}
diff --git a/cookbooks/cplanet/recipes/default.rb b/cookbooks/planet/recipes/current.rb
similarity index 96%
rename from cookbooks/cplanet/recipes/default.rb
rename to cookbooks/planet/recipes/current.rb
index 1d3b6499c..919956d89 100644
--- a/cookbooks/cplanet/recipes/default.rb
+++ b/cookbooks/planet/recipes/current.rb
@@ -1,6 +1,6 @@
 #
-# Cookbook Name:: cplanet
-# Recipe:: default
+# Cookbook Name:: planet
+# Recipe:: current
 #
 # Copyright 2018, OpenStreetMap Foundation
 #
diff --git a/cookbooks/cplanet/templates/default/planet-update-file.erb b/cookbooks/planet/templates/default/planet-update-file.erb
similarity index 100%
rename from cookbooks/cplanet/templates/default/planet-update-file.erb
rename to cookbooks/planet/templates/default/planet-update-file.erb
diff --git a/cookbooks/cplanet/templates/default/planet-update.cron.erb b/cookbooks/planet/templates/default/planet-update.cron.erb
similarity index 100%
rename from cookbooks/cplanet/templates/default/planet-update.cron.erb
rename to cookbooks/planet/templates/default/planet-update.cron.erb
diff --git a/cookbooks/cplanet/templates/default/planet-update.erb b/cookbooks/planet/templates/default/planet-update.erb
similarity index 87%
rename from cookbooks/cplanet/templates/default/planet-update.erb
rename to cookbooks/planet/templates/default/planet-update.erb
index 683214e18..d002b4fbe 100644
--- a/cookbooks/cplanet/templates/default/planet-update.erb
+++ b/cookbooks/planet/templates/default/planet-update.erb
@@ -9,7 +9,7 @@ echo "Updating planet file..."
 runuser -u planet -- /usr/local/bin/planet-update-file
 
 echo "Running jobs..."
-<% node[:cplanet][:jobs].each do |job| -%>
+<% node[:planet][:current][:jobs].each do |job| -%>
 
 echo "Running '<%= job[:command] %>' as user '<%= job[:user] %>'..."
 
diff --git a/cookbooks/cplanet/templates/default/planet-update.logrotate.erb b/cookbooks/planet/templates/default/planet-update.logrotate.erb
similarity index 100%
rename from cookbooks/cplanet/templates/default/planet-update.logrotate.erb
rename to cookbooks/planet/templates/default/planet-update.logrotate.erb
diff --git a/roles/cplanet.rb b/roles/cplanet.rb
deleted file mode 100644
index 20d16cd26..000000000
--- a/roles/cplanet.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-name "cplanet"
-description "Role applied to servers providing a current planet file"
-
-default_attributes(
-  :accounts => {
-    :users => {
-      :jochen => {
-        :status => :administrator
-      },
-      :cplanet => {
-        :status => :role,
-        :members => [:jochen, :tomh]
-      }
-    }
-  }
-)
-
-run_list(
-  "recipe[cplanet]"
-)