From 6bc5849ea888e44b1fc014c1eaedba646e3223e7 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Thu, 13 Jan 2022 01:37:27 +0000
Subject: [PATCH] puppet: Remove now-unused debathena apt repository.

---
 .../manifests/apt_repository_debathena.pp     |  7 -----
 puppet/zulip_ops/manifests/profile/zmirror.pp |  2 --
 .../manifests/profile/zmirror_personals.pp    |  2 --
 .../apt-repos/zulip_debathena/bionic.list     |  2 --
 .../zulip_debathena/debathena-archive.asc     | 30 -------------------
 5 files changed, 43 deletions(-)
 delete mode 100644 puppet/zulip_ops/manifests/apt_repository_debathena.pp
 delete mode 100644 scripts/setup/apt-repos/zulip_debathena/bionic.list
 delete mode 100644 scripts/setup/apt-repos/zulip_debathena/debathena-archive.asc

diff --git a/puppet/zulip_ops/manifests/apt_repository_debathena.pp b/puppet/zulip_ops/manifests/apt_repository_debathena.pp
deleted file mode 100644
index 293250c513..0000000000
--- a/puppet/zulip_ops/manifests/apt_repository_debathena.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class zulip_ops::apt_repository_debathena {
-  $setup_apt_repo_file = "${::zulip_scripts_path}/lib/setup-apt-repo"
-  exec { 'setup_apt_repo_debathena':
-    command => "${setup_apt_repo_file} --list zulip_debathena",
-    unless  => "${setup_apt_repo_file} --list zulip_debathena --verify",
-  }
-}
diff --git a/puppet/zulip_ops/manifests/profile/zmirror.pp b/puppet/zulip_ops/manifests/profile/zmirror.pp
index ddee8b3100..ee99edda07 100644
--- a/puppet/zulip_ops/manifests/profile/zmirror.pp
+++ b/puppet/zulip_ops/manifests/profile/zmirror.pp
@@ -1,6 +1,5 @@
 class zulip_ops::profile::zmirror {
   include zulip_ops::profile::base
-  include zulip_ops::apt_repository_debathena
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror
@@ -18,7 +17,6 @@ class zulip_ops::profile::zmirror {
   ]
   package { $zmirror_packages:
     ensure  => 'installed',
-    require => Exec['setup_apt_repo_debathena'],
   }
 
   file { "${zulip::common::supervisor_conf_dir}/zmirror.conf":
diff --git a/puppet/zulip_ops/manifests/profile/zmirror_personals.pp b/puppet/zulip_ops/manifests/profile/zmirror_personals.pp
index 1c461cb443..78bdeb05c1 100644
--- a/puppet/zulip_ops/manifests/profile/zmirror_personals.pp
+++ b/puppet/zulip_ops/manifests/profile/zmirror_personals.pp
@@ -1,6 +1,5 @@
 class zulip_ops::profile::zmirror_personals {
   include zulip_ops::profile::base
-  include zulip_ops::apt_repository_debathena
   include zulip::supervisor
 
   $zmirror_packages = [# Packages needed to run the mirror
@@ -18,7 +17,6 @@ class zulip_ops::profile::zmirror_personals {
   ]
   package { $zmirror_packages:
     ensure  => 'installed',
-    require => Exec['setup_apt_repo_debathena'],
   }
 
   file { '/etc/krb5.conf':
diff --git a/scripts/setup/apt-repos/zulip_debathena/bionic.list b/scripts/setup/apt-repos/zulip_debathena/bionic.list
deleted file mode 100644
index 74cdabd83a..0000000000
--- a/scripts/setup/apt-repos/zulip_debathena/bionic.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://debathena.mit.edu/apt bionic debathena debathena-config
-deb-src http://debathena.mit.edu/apt bionic debathena debathena-config
diff --git a/scripts/setup/apt-repos/zulip_debathena/debathena-archive.asc b/scripts/setup/apt-repos/zulip_debathena/debathena-archive.asc
deleted file mode 100644
index 22c15aa933..0000000000
--- a/scripts/setup/apt-repos/zulip_debathena/debathena-archive.asc
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQINBEoRh7YBEAC7s6oh9+2UZ6LGMRdwvSZdGsX1iHKvY23yq9swagL0LF1z5AVE
-mlaRtdi3VhJr1zRBARvJqvu2GyAFIxgihyA0Mhcwp5XDZflwZoLYYrBKoxEeq0pI
-oxBPQCoOdJRpRY6IPGKZuEW3oDn248/E7+ezKJhLHU6eGftTQ0wBEJ956IWWaW3E
-nuRC5U2USd9jCKvzb3kDcfhryzgtpAxk75MODwAttUYxYTjJ1NoKwh3QeDTsByzu
-MU8hvgaEyl+Ot1+7tjB/XVlvFCfkYphayVUIXivv7juB+KFjt+RU+V2YALRj6hPV
-Go3MGFkob2dP5UJWAyukumEBhu7ptRpfsWKihpU7FRR8khYYkWe5C1Ch8jEtLyCF
-1Jp6nEB0upO8vDeE+RsTXJKA4S9p1FnTmFVl0XjCK5VYV5R1PKiesk0EiityNeYl
-WwKFiN/AGBjbhee1hm/NH603bcIb3K/5zwugb4JutbdW4DZrB34MMV5/CM1RQM5K
-s63hOp8YEnLiTCI6aMfwN6AvlCYYOeUOoGpzbjJkXo3s8uydUpaZRZyPLWJJ/Zhv
-dEmCMIbRS6SrqVoFTuxNQLh3CeO05ofAtErmbwCIhGftwlQlFMZ+/dCxjbECOjv0
-zTdgeWyB+8PkqWgkechowrRzMCXTpHPGpoyniBSc6HW7Pnsi8e2R1eaKzwARAQAB
-tDtEZWJhdGhlbmEgUHJvamVjdCAoQXJjaGl2ZSBTaWduaW5nIEtleSkgPGRlYmF0
-aGVuYUBtaXQuZWR1PokCNwQTAQgAIQUCShGHtgIbAwULCQgHAwUVCgkICwUWAgMB
-AAIeAQIXgAAKCRDk7mJwDYqej44nD/kB6O4F06aVoIzcJCmnrm1c0GIfX8QsKdJ8
-C4yKfYp+l/eq23GfrdK9j83N8EMlbgYTYPHqthcFi9XVIspAzxHZkitrB7fRVbba
-ZWy27MqmXXAmKEZTGrGALmw+W/MUUC6S6il2n8Yupw/df+7maBM3Q3bovofnCDLX
-KvosirBWddVepjXiH6KgM/Tm06nuqFuyk/o8CpEqRCtw5GZWEclA9WNWX2nPV+3n
-X0Z7ft1l+1PzCAN4m5WsGBQCanQ9kfYhi0Lb2B36NM8R7koJHAciK/+mkAegXXhT
-OYSd4MWuuh2e6Fs/AEK+wt2YyU/D1OFKPCUXDwGcEFRNh83LU/1GpEEFM35plyQr
-v84gWXRU6BwiI7qHiypkrHxlIfgdbG5AzeXCm7xgM92heeTwmijQmI5VOl2OogC/
-Oiv/2xaQXJUng/DemgOHldoTDZq5e64AI6JG7EsQltbNyhybJe801AHZc/FwhawL
-+IfE91CpUDkwhCVpu8kEOXDI54CCkl7/4rYVHbgLKES2hX7qWL9Eie+In6g0dSLx
-XNa5+CTt7PMT226ot+uI6EKjLroShpcMkDty5DCzKcI3qVkG7+Zmtd0AWOBjILsl
-wND5fw5QobJxu54sbRazxLMM8mN1ju339a7XA+rayCOLLMjabht6bUlyRmGWBB/p
-SYgvE5ESmw==
-=AvCF
------END PGP PUBLIC KEY BLOCK-----