From 572443edc6c688771b8fb37096480c06df439366 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Fri, 8 Apr 2022 11:37:48 -0700
Subject: [PATCH] puppet: Remove memcached SASL workaround.

https://bugs.launchpad.net/ubuntu/+source/memcached/+bug/1878721 was
fixed and released in Focal in 2020-06-24.

We don't bother with an `ensure => absent` because leaving this
in-place for existing installs does no harm.
---
 puppet/zulip/manifests/profile/memcached.pp | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/puppet/zulip/manifests/profile/memcached.pp b/puppet/zulip/manifests/profile/memcached.pp
index 78c7356e46..4d3b9b768e 100644
--- a/puppet/zulip/manifests/profile/memcached.pp
+++ b/puppet/zulip/manifests/profile/memcached.pp
@@ -70,24 +70,6 @@ saslpasswd2 -p -f /etc/sasl2/memcached-sasldb2 \
     source  => 'puppet:///modules/zulip/sasl2/memcached.conf',
     notify  => Service[memcached],
   }
-  file { '/etc/systemd/system/memcached.service.d':
-    ensure => directory,
-  }
-  file { '/etc/systemd/system/memcached.service.d/zulip-fix-sasl.conf':
-    require => File['/etc/systemd/system/memcached.service.d'],
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => "\
-# https://bugs.launchpad.net/ubuntu/+source/memcached/+bug/1878721
-[Service]
-Environment=SASL_CONF_PATH=/etc/sasl2
-",
-    notify  => [
-      Class['zulip::systemd_daemon_reload'],
-      Service['memcached'],
-    ],
-  }
   file { '/etc/memcached.conf':
     ensure  => file,
     require => [