Merge remote-tracking branch 'github/pull/699'

[chef.git] / cookbooks / db / recipes / master.rb

diff --git a/cookbooks/db/recipes/master.rb b/cookbooks/db/recipes/master.rb
index 3b6890320f0fa452e6f6538e7c9185460c269079..606e902bff69be86dc635c4fc1814021a125fd9b 100644 (file)
--- a/cookbooks/db/recipes/master.rb
+++ b/cookbooks/db/recipes/master.rb
@@ -62,11 +62,6 @@ postgresql_user "backup" do
   password passwords["backup"]
 end
 
-postgresql_user "munin" do
-  cluster node[:db][:cluster]
-  password passwords["munin"]
-end
-
 postgresql_user "replication" do
   cluster node[:db][:cluster]
   password passwords["replication"]
@@ -88,7 +83,6 @@ CGIMAP_PERMISSIONS = {
   "changeset_comments" => [:select],
   "changeset_tags" => [:select],
   "changesets" => [:select, :update],
-  "client_applications" => [:select],
   "current_node_tags" => [:select, :insert, :delete],
   "current_nodes" => [:select, :insert, :update],
   "current_nodes_id_seq" => [:update],
@@ -106,9 +100,6 @@ CGIMAP_PERMISSIONS = {
   "oauth_access_grants" => [:select],
   "oauth_access_tokens" => [:select],
   "oauth_applications" => [:select],
-  "oauth_nonces" => [:select, :insert],
-  "oauth_nonces_id_seq" => [:update],
-  "oauth_tokens" => [:select],
   "relation_members" => [:select, :insert],
   "relation_tags" => [:select, :insert],
   "relations" => [:select, :insert],
@@ -156,7 +147,6 @@ PROMETHEUS_PERMISSIONS = {
   changeset_tags
   changesets
   changesets_subscribers
-  client_applications
   current_node_tags
   current_nodes
   current_relation_members
@@ -184,9 +174,7 @@ PROMETHEUS_PERMISSIONS = {
   oauth_access_grants
   oauth_access_tokens
   oauth_applications
-  oauth_nonces
   oauth_openid_requests
-  oauth_tokens
   redactions
   relation_members
   relation_tags
@@ -197,7 +185,6 @@ PROMETHEUS_PERMISSIONS = {
   user_mutes
   user_preferences
   user_roles
-  user_tokens
   users
   way_nodes
   way_tags
@@ -224,7 +211,6 @@ end
   active_storage_variant_records_id_seq
   changeset_comments_id_seq
   changesets_id_seq
-  client_applications_id_seq
   current_nodes_id_seq
   current_relations_id_seq
   current_ways_id_seq
@@ -242,15 +228,12 @@ end
   oauth_access_grants_id_seq
   oauth_access_tokens_id_seq
   oauth_applications_id_seq
-  oauth_nonces_id_seq
   oauth_openid_requests_id_seq
-  oauth_tokens_id_seq
   redactions_id_seq
   reports_id_seq
   user_blocks_id_seq
   user_mutes_id_seq
   user_roles_id_seq
-  user_tokens_id_seq
   users_id_seq
 ].each do |sequence|
   postgresql_sequence sequence do
@@ -305,7 +288,7 @@ end
 
 systemd_timer "yearly-reindex" do
   description "Yearly database reindex"
-  on_calendar "Fri *-1-8..14 02:00"
+  on_calendar "Thu *-1-8..14 02:00"
 end
 
 service "yearly-reindex.timer" do