docs/email.md

@@ -62,8 +62,8 @@ rspamadm dkim_keygen -s dkim-rsa -b 4096 -d archlinux.org -t rsa -k archlinux.or
 the ouput gives you the DNS entries to add to the terraform files.
 The keys generated need to go to the vault:
 ```
-roles/rspamd/files/archlinux.org.dkim-rsa.key
-roles/rspamd/files/archlinux.org.dkim-ed25519.key
+roles/rspamd/files/archlinux.org.dkim-rsa.key.vault
+roles/rspamd/files/archlinux.org.dkim-ed25519.key.vault
 ```
 
 # Gitlab servicedesk

roles/aurweb/tasks/main.yml

@@ -33,7 +33,7 @@
   file: path={{ aur_user.home }}/.ssh state=directory owner={{ aur_user.name }} group={{ aur_user.name }} mode=0700
 
 - name: Install SSH key for mirroring to GitHub
-  copy: src=id_ed25519 dest={{ aur_user.home }}/.ssh/ owner={{ aur_user.name }} group={{ aur_user.name }} mode=0600
+  copy: src=id_ed25519.vault dest={{ aur_user.home }}/.ssh/id_ed25519 owner={{ aur_user.name }} group={{ aur_user.name }} mode=0600
 
 - name: Fetch host keys for github.com
   command: ssh-keyscan github.com

roles/mailman3/tasks/main.yml

 - name: Install mailman3 and related packages
-  pacman: name=mailman3,mailman3-hyperkitty,python-psycopg2,mailman-web,uwsgi-plugin-python state=present
+  pacman: name=mailman3,mailman3-hyperkitty,python-psycopg2,mailman-web,python-xapian-haystack,uwsgi-plugin-python state=present
   register: install
 
 - name: Install {mailman,mailman-web} configuration

roles/mailman3/templates/nginx.d.conf.j2

@@ -10,8 +10,8 @@ server {
     access_log   /var/log/nginx/{{ lists_domain }}/access.log.json json_main;
     error_log    /var/log/nginx/{{ lists_domain }}/error.log;
 
-    location /static {
-      alias /var/lib/mailman-web/static;
+    location /static/ {
+      alias /var/lib/mailman-web/static/;
     }
 
     # include uwsgi_params

roles/mailman3/templates/settings.py.j2

@@ -51,7 +51,7 @@ HYPERKITTY_ENABLE_GRAVATAR = False
 
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': '/var/lib/mailman-web/fulltext_index'
+        'ENGINE': 'xapian_backend.XapianEngine',
+        'PATH': '/var/lib/mailman-web/xapian_index'
     }
 }

roles/rspamd/tasks/main.yml

@@ -22,11 +22,11 @@
 #
 # the ouput gives you the DNS entries to add to the terraform files.
 # The keys generated need to go to the vault:
-# roles/rspamd/files/archlinux.org.dkim-rsa.key
-# roles/rspamd/files/archlinux.org.dkim-ed25519.key
+# roles/rspamd/files/archlinux.org.dkim-rsa.key.vault
+# roles/rspamd/files/archlinux.org.dkim-ed25519.key.vault
 #
 - name: Install DKIM keys
-  copy: src={{ item }} dest=/var/lib/rspamd/dkim/ owner=rspamd group=rspamd mode=0600
+  copy: src={{ item }}.vault dest=/var/lib/rspamd/dkim/{{ item }} owner=rspamd group=rspamd mode=0600
   loop:
     - "{{ rspamd_dkim_domain }}.dkim-ed25519.key"
     - "{{ rspamd_dkim_domain }}.dkim-rsa.key"