Use explicitly defined admins from inventory

I used to have separate admin@ and abuse@ accounts for each virtual host. I
don't really need that separation, though, as I am the only admin, and no-one
has ever contacted them anyway. So, set all admin accounts to the account I
actually use and check every day anyway.

1 files changed, 3 insertions, 14 deletions

diff --git a/files/virtual_host.cfg.lua.j2 b/files/virtual_host.cfg.lua.j2
index a5ab87e..a8243e5 100644
--- a/files/virtual_host.cfg.lua.j2
+++ b/files/virtual_host.cfg.lua.j2
@@ -4,11 +4,11 @@
 
 VirtualHost "{{ virtual_host }}"
 
-{% if not is_transport_server %}
 admins = {
-    "admin@{{ virtual_host }}"
+{% for admin in admins %}
+    "{{ admin }}"
+{% endfor %}
 }
-{% endif %}
 
 modules_enabled = {
 
@@ -39,17 +39,6 @@ site_apps_show = {
 {% endif %}
 
 {% if not is_transport_server %}
-contact_info = {
-    abuse = {
-        "xmpp:abuse@{{ virtual_host }}"
-    };
-    admin = {
-        "xmpp:admin@{{ virtual_host }}"
-    };
-}
-{% endif %}
-
-{% if not is_transport_server %}
 allow_user_invites = true
 http_external_url = "https://{{ virtual_host }}/"
 site_name = "{{ virtual_host }}"