From 3feaacf3ebc2a5146fbb99e77d77ff2f8fe72949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Thu, 8 Sep 2016 06:38:26 +0000 Subject: [PATCH] Mailman: fix initial data --- roles/mailman/files/post-update.sh | 6 ++++++ roles/mailman/tasks/main.yml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/mailman/files/post-update.sh b/roles/mailman/files/post-update.sh index 1923330c01..d4b337a4f4 100755 --- a/roles/mailman/files/post-update.sh +++ b/roles/mailman/files/post-update.sh @@ -10,9 +10,13 @@ BASEDIR=`yamlget basedir $CONFFILE` CONFDIR=`yamlget confdir $CONFFILE` INDEXDIR=$BASEDIR/fulltext_index +echo "static files" django-admin collectstatic --clear --noinput --verbosity 0 --pythonpath $CONFDIR --settings settings django-admin compress --pythonpath $CONFDIR --settings settings +echo "db migration" django-admin migrate --pythonpath $CONFDIR --settings settings_admin --noinput +echo "load initial data" +django-admin loaddata $CONFDIR/initial-data.json --pythonpath $CONFDIR --settings settings mkdir -p $INDEXDIR chown apache:apache -R $INDEXDIR @@ -21,9 +25,11 @@ sleep $[ ( $RANDOM % 10 ) + 1 ]s # avoid simultaneous lockups on parallel serve $BASEDIR/bin/pg-give-rights.py > /dev/null # SELinux contexts +echo "SELinux contexts" restorecon -r "$BASEDIR" # Run unit tests +echo "unit tests" django-admin test --pythonpath $CONFDIR --settings settings_test hyperkitty postorius # Reload Apache to flush the python cache diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml index 2b3044b413..99c883fc00 100644 --- a/roles/mailman/tasks/main.yml +++ b/roles/mailman/tasks/main.yml @@ -372,8 +372,8 @@ - periodic.py - name: copy the initial user fixture - copy: src=postorius.initial-user.json - dest=/etc/postorius/sites/default/initial-user.json + template: src=initial-data.json + dest={{ mailman_webui_basedir }}/config/initial-data.json owner=root group=apache mode=0640 tags: mailman