mirror of https://github.com/zulip/zulip.git
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.
This commit is contained in:
parent
b4a8817ec9
commit
572443edc6
|
@ -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 => [
|
||||
|
|
Loading…
Reference in New Issue