From f70cb82238ccfa4542d869a9477af85e0b96be85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Wed, 1 Dec 2021 11:53:33 -0500
Subject: [PATCH] move more backup stuff to fabric

---
 howto/retire-a-host.md | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/howto/retire-a-host.md b/howto/retire-a-host.md
index 337e17fb..10cb5907 100644
--- a/howto/retire-a-host.md
+++ b/howto/retire-a-host.md
@@ -49,25 +49,6 @@
 
  11. remove from reverse DNS
 
- 12. after 30 days delay, retire from Bacula catalog, on the director
-     (currently `bacula-director-01`), run `bconsole` then:
- 
-        delete client=$INSTANCE-fd
-    
-     for example:
-     
-        delete client=archeotrichon.torproject.org-fd
-
-     <!-- sync this section with howto/backup#retiring-a-client when -->
-     <!-- changing -->
-     
-     TODO: add to fabric
-
- 13. after 30 days delay, remove PostgreSQL backups on the storage
-     server (currently `/srv/backups/pg` on `bungi`), if relevant
-
-     TODO: add to fabric
-
 Equivalent retirement checklist to copy-paste in retirement tickets:
 
  1. [ ] announcement
@@ -81,8 +62,6 @@ Equivalent retirement checklist to copy-paste in retirement tickets:
  9. [ ] remove from docs
  10. [ ] remove from racks
  11. [ ] remove from reverse DNS
- 12. [ ] remove from bacula director
- 13. [ ] remove PostgreSQL backups
 
 ## Wiping disks
 
@@ -267,6 +246,17 @@ completely avoided.
  15. if it's a physical machine or a virtual host we don't control,
      schedule removal from racks or hosts with upstream
 
-TODO: remove the client from the Bacula catalog, see
-<https://bugs.torproject.org/30880>. Done by the Fabric procedure
-above.
+ 16. after 30 days delay, retire from Bacula catalog, on the director
+     (currently `bacula-director-01`), run `bconsole` then:
+ 
+        delete client=$INSTANCE-fd
+    
+     for example:
+     
+        delete client=archeotrichon.torproject.org-fd
+
+     <!-- sync this section with howto/backup#retiring-a-client when -->
+     <!-- changing -->
+     
+ 17. after 30 days delay, remove PostgreSQL backups on the storage
+     server (currently `/srv/backups/pg` on `bungi`), if relevant
-- 
GitLab