From c8df9a150ef599473da6d89cc9516456ad49503b Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 12 Oct 2020 17:23:16 -0700
Subject: [PATCH] puppet: Drop all log2zulip configuration.

Disabled on webservers in 047817b6b0f2, it has since lingered in
configuration, as well as running (to no effect) every minute on the
loadbalancer.

Remove the vestiges of its configuration.
---
 puppet/zulip_ops/files/cron.d/log2zulip    |  3 ---
 puppet/zulip_ops/files/log2zulip.conf      |  1 -
 puppet/zulip_ops/files/log2zulip.zuliprc   |  4 ----
 puppet/zulip_ops/manifests/app_frontend.pp | 16 ---------------
 puppet/zulip_ops/manifests/loadbalancer.pp | 23 ++--------------------
 5 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 puppet/zulip_ops/files/cron.d/log2zulip
 delete mode 100644 puppet/zulip_ops/files/log2zulip.conf
 delete mode 100644 puppet/zulip_ops/files/log2zulip.zuliprc

diff --git a/puppet/zulip_ops/files/cron.d/log2zulip b/puppet/zulip_ops/files/cron.d/log2zulip
deleted file mode 100644
index cb371142e4..0000000000
--- a/puppet/zulip_ops/files/cron.d/log2zulip
+++ /dev/null
@@ -1,3 +0,0 @@
-MAILTO=root
-
-* * * * *   zulip cd /home/zulip/deployments/current && python3 ./zulip-current-venv/share/zulip/integrations/log2zulip/log2zulip
diff --git a/puppet/zulip_ops/files/log2zulip.conf b/puppet/zulip_ops/files/log2zulip.conf
deleted file mode 100644
index 4dcf9f3a71..0000000000
--- a/puppet/zulip_ops/files/log2zulip.conf
+++ /dev/null
@@ -1 +0,0 @@
-["/var/log/nginx/error.log"]
diff --git a/puppet/zulip_ops/files/log2zulip.zuliprc b/puppet/zulip_ops/files/log2zulip.zuliprc
deleted file mode 100644
index 498cfca778..0000000000
--- a/puppet/zulip_ops/files/log2zulip.zuliprc
+++ /dev/null
@@ -1,4 +0,0 @@
-[api]
-email = log-bot@zulip.com
-key = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-site = https://zulip.com
diff --git a/puppet/zulip_ops/manifests/app_frontend.pp b/puppet/zulip_ops/manifests/app_frontend.pp
index 404d205c72..9e012efb1d 100644
--- a/puppet/zulip_ops/manifests/app_frontend.pp
+++ b/puppet/zulip_ops/manifests/app_frontend.pp
@@ -18,22 +18,6 @@ class zulip_ops::app_frontend {
     source => 'puppet:///modules/zulip/logrotate/zulip',
   }
 
-  file { '/etc/log2zulip.conf':
-    ensure => file,
-    owner  => 'zulip',
-    group  => 'zulip',
-    mode   => '0644',
-    source => 'puppet:///modules/zulip_ops/log2zulip.conf',
-  }
-
-  file { '/etc/log2zulip.zuliprc':
-    ensure => file,
-    owner  => 'zulip',
-    group  => 'zulip',
-    mode   => '0600',
-    source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
-  }
-
   file { '/etc/supervisor/conf.d/redis_tunnel.conf':
     ensure  => file,
     require => Package['supervisor', 'autossh'],
diff --git a/puppet/zulip_ops/manifests/loadbalancer.pp b/puppet/zulip_ops/manifests/loadbalancer.pp
index 18e20680e8..77b88b51bf 100644
--- a/puppet/zulip_ops/manifests/loadbalancer.pp
+++ b/puppet/zulip_ops/manifests/loadbalancer.pp
@@ -20,27 +20,8 @@ class zulip_ops::loadbalancer {
     notify  => Service['nginx'],
   }
 
-  file { '/etc/log2zulip.conf':
-    ensure => file,
-    owner  => 'zulip',
-    group  => 'zulip',
-    mode   => '0644',
-    source => 'puppet:///modules/zulip_ops/log2zulip.conf',
-  }
-
+  # Can be removed if you see it deployed:
   file { '/etc/cron.d/log2zulip':
-    ensure => file,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    source => 'puppet:///modules/zulip_ops/cron.d/log2zulip',
-  }
-
-  file { '/etc/log2zulip.zuliprc':
-    ensure => file,
-    owner  => 'zulip',
-    group  => 'zulip',
-    mode   => '0600',
-    source => 'puppet:///modules/zulip_ops/log2zulip.zuliprc',
+    ensure => absent,
   }
 }