From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 20 Sep 2019 18:24:46 +0000 (+0200)
Subject: The da-backup on lw03 has not been useful in a long time, remove it
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4fd2a89f6e76cf67ba3ddd1ca6b512c2b4501be8;p=mirror%2Fdsa-puppet.git

The da-backup on lw03 has not been useful in a long time, remove it

It was useful for backing up the morgue to storace, but since
lw03 ran out of disk space for morgue probably years ago, we should
not keep this around anymore.
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a8b6b1f57..d34000284 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -124,8 +124,6 @@ roles:
     # XXX - used by ferm templates/defs.conf.erb
     - backuphost.debian.org
     - storace.debian.org
-  dabackup_client:
-    - lw03.debian.org
   debian_mirror:
     # XXX used also in ferm me.conf.erb
     klecker.debian.org:
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index d870253da..baa7b5ad3 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -268,7 +268,6 @@ file=/etc/postfix/debian
 file=/etc/ssh/ssh_known_hosts
 file=/etc/ssh/ssh-rsa-shadow
 file=/var/lib/misc/ssh-rsa-shadow
-file=/etc/.da-backup.trace
 file=/etc/postfix/debianhosts
 file=/etc/postfix/debianhosts.db
 file=/etc/blkid.tab
diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index d7c200215..efb9391be 100644
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -42,20 +42,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDJp6ryOTW7VgqEa+n6uKpi/bh2PO4P9Z/voz0zPYtP
 # tfheen
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIm6NFrs16bhmsb/gZ5tDUTQ4QZGHtLHor3M9YeRXIl+ tfheen debian adm 2019-01-02
 <%=
-
-machine_keys = []
-case @fqdn
-  when "storace.debian.org" then
-    roles['dabackup_client'].each do |node|
-      if allnodeinfo.has_key?(node)
-        hostname = allnodeinfo[node]['hostname'][0]
-
-        machine_keys << "# #{hostname}"
-        machine_keys << "command=\"/usr/lib/da-backup/da-backup-ssh-wrap #{hostname}\",from=\"#{allnodeinfo[node]['ipHostNumber'].join(',')}\",restrict #{allnodeinfo[node]['sshRSAHostKey'][0]}"
-      else
-        machine_keys << "# host #{node} not found in allnodeinfo"
-      end
-  end
-end
-machine_keys.join("\n")
-%>