Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Mailman: fix pg_hba perms and improve import script

Browse source
This commit is contained in:
Aurélien Bompard 2014-03-21 22:14:10 +00:00
parent 750c09b4c9
commit 188978aad6
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
View file

@ -63,6 +63,7 @@
creates=/var/lib/pgsql/data/postgresql.conf creates=/var/lib/pgsql/data/postgresql.conf
- name: copy pg_hba.conf - name: copy pg_hba.conf
copy: src="{{ files }}/lists-dev/pg_hba.conf" dest=/var/lib/pgsql/data/pg_hba.conf copy: src="{{ files }}/lists-dev/pg_hba.conf" dest=/var/lib/pgsql/data/pg_hba.conf
owner=postgres group=postgres
notify: notify:
- restart postgresql - restart postgresql
- name: start postgresql - name: start postgresql

8
roles/mailman/files/import-mm2.py
View file

@ -23,10 +23,11 @@ class Importer(object):
def __init__(self, opts, config): def __init__(self, opts, config):
self.opts = opts self.opts = opts
self.config = config self.config = config
self.index_path = self._get_index_path()
self.existing_lists = [ l.strip() for l in self.existing_lists = [ l.strip() for l in
cmdget(["sudo", "-u", "mailman", cmdget(["sudo", "-u", "mailman",
"mailman3", "lists", "-q"]).split("\n") ] "mailman3", "lists", "-q"]).split("\n") ]
self.index_path = self._get_index_path() self.excluded = opts.exclude.strip().split(",")
def _get_index_path(self): def _get_index_path(self):
sys.path.append(self.config["confdir"]) sys.path.append(self.config["confdir"])
@ -41,6 +42,9 @@ class Importer(object):
all_listnames.sort() all_listnames.sort()
for index, listname in enumerate(all_listnames): for index, listname in enumerate(all_listnames):
listaddr = "%s@%s" % (listname, self.config["domain"]) listaddr = "%s@%s" % (listname, self.config["domain"])
if listname in self.excluded or listaddr in self.excluded:
print "Skipping excluded list %s" % listaddr
continue
print listaddr, "(%d/%d)" % (index+1, len(all_listnames)) print listaddr, "(%d/%d)" % (index+1, len(all_listnames))
confpickle = os.path.join(mm2libdir, 'lists', listname, confpickle = os.path.join(mm2libdir, 'lists', listname,
'config.pck') 'config.pck')
@ -84,6 +88,8 @@ def main():
help="Don't import the archives, only import the list config") help="Don't import the archives, only import the list config")
parser.add_option("-c", "--config", default="/etc/mailman-migration.conf", parser.add_option("-c", "--config", default="/etc/mailman-migration.conf",
help="Configuration file (default: %defaults)") help="Configuration file (default: %defaults)")
parser.add_option("-x", "--exclude", default="",
help="Comma-separated list of lists to exclude")
opts, args = parser.parse_args() opts, args = parser.parse_args()
if len(args) != 1: if len(args) != 1:
parser.error("Only one arg: the Mailman 2.1 lib dir to import") parser.error("Only one arg: the Mailman 2.1 lib dir to import")