Template out matrix vars a bit more nicely, make config changes

inventory/group_vars/9iron.yml

@@ -62,6 +62,12 @@ grafana_mysql_password: !vault |
 grafana_url: "monitor.9iron.club"
 grafana_webroot: "/var/www/grafana"
 
+# Matrix
+matrix_server_name: "9iron.club"
+matrix_url: "matrix.9iron.club"
+matrix_webroot: "/var/www/riot"
+matrix_enable_registration: "true"
+
 # Nextcloud
 nextcloud_mysql_password: !vault |
         $ANSIBLE_VAULT;1.1;AES256

roles/matrix/defaults/main.yml

@@ -0,0 +1,4 @@
+# vim:ft=ansible:
+matrix_admin_contact: "mailto:rehashedsalt@cock.li"
+matrix_disabled_message: "Matrix on this server is down for maintenance"
+matrix_enable_registration: "false"

roles/matrix/templates/homeserver.yaml

@@ -31,9 +31,9 @@ listeners:
         compress: false
 
 ## Homeserver blocking ##
-admin_contact: 'mailto:rehashedsalt@cock.li'
+admin_contact: '{{ matrix_admin_contact }}'
 #hs_disabled: false
-#hs_disabled_message: 'Matrix on this server is down for maintenance'
+#hs_disabled_message: '{{ matrix_disabled_message }}'
 retention:
   enabled: true
   default_policy:

roles/matrix/templates/server_name.yaml

@@ -1,9 +1,3 @@
-# This file is autogenerated, and will be recreated on upgrade if it is deleted.
+# This file is managed via Ansible; any changes here will be overwritten
-# Any changes you make will be preserved.
+# And rightfully so. Don't screw with this
-
-# The domain name of the server, with optional explicit port.
-# This is used by remote servers to connect to this server,
-# e.g. matrix.org, localhost:8080, etc.
-# This is also the last part of your UserID.
-#
 server_name: {{ matrix_server_name }}

roles/matrix/templates/shared_secrets.yaml

@@ -1,3 +1,4 @@
-# This file contains shared secrets so you can leave them out of homeserver.yaml
+# This file is managed via Ansible; any changes here will be overwritten
+# And rightfully so. Don't screw with this
 registration_shared_secret: {{ matrix_reg_secret.stdout }}
 turn_shared_secret: {{ matrix_turn_secret.stdout }}

webservers.yml

@@ -9,11 +9,6 @@
     - role: backups
       tags: [ backups ]
     - role: matrix
-      vars:
-        matrix_server_name: "9iron.club"
-        matrix_url: "matrix.9iron.club"
-        matrix_webroot: "/var/www/riot"
-        matrix_enable_registration: "true"
       tags: [ fedi, matrix ]
 - hosts: web1
   roles: