From 0c6dc18085e28ccc0454e91fcf593d3205a429ab Mon Sep 17 00:00:00 2001 From: Max Erenberg Date: Tue, 18 May 2021 01:52:09 -0400 Subject: [PATCH] update mailman path to use virtualenv --- ceo/urwid/newmember.py | 2 +- debian/changelog | 6 ++++++ src/op-mailman | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ceo/urwid/newmember.py b/ceo/urwid/newmember.py index 860f95bbc..012d7b17b 100644 --- a/ceo/urwid/newmember.py +++ b/ceo/urwid/newmember.py @@ -225,7 +225,7 @@ class EndPage(WizardPanel): members.register(self.state['userid'], self.state['terms']) mailman_result = members.subscribe_to_mailing_list(self.state['userid']) - if mailman_result.split(': ',1)[0] not in ('Subscribed', 'Already a member', 'Disabled'): + if mailman_result != 'None': problem = mailman_result elif self.utype == 'clubuser': diff --git a/debian/changelog b/debian/changelog index 47c4c42d4..9a079563c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ceo (0.7.1-buster1) buster; urgency=medium + + * Update mailman path to use virtualenv + + -- Max Erenberg Tue, 18 May 2021 01:45:49 -0400 + ceo (0.7.0-buster1) buster; urgency=medium * Set userPassword field in LDAP for SASL authentication diff --git a/src/op-mailman b/src/op-mailman index c359148bb..312ecd53b 100755 --- a/src/op-mailman +++ b/src/op-mailman @@ -32,7 +32,7 @@ def main(): return if remote_user == user_to_add or check_group(remote_user, 'office') or check_group(remote_user, 'syscom'): - mailman = Popen(["/usr/bin/mailman", "members", "-a", "-", "%s@%s" % (cfg['members_list'], cfg['list_domain'])], + mailman = Popen(["/opt/mailman3/bin/mailman", "addmembers", "-", "%s@%s" % (cfg['members_list'], cfg['list_domain'])], stdin=PIPE, stdout=PIPE, stderr=STDOUT) out, err = mailman.communicate("%s@%s\n" % (user_to_add, cfg['list_domain'])) syslog.syslog(syslog.LOG_INFO, out)