Config changes needed for recent updates.

inventory/host_vars/matrix.awful.club/vars.yml

@@ -40,7 +40,7 @@ matrix_appservice_slack_enabled: True
 matrix_appservice_slack_control_room_id: "{{ MATRIX_APPSERVICE_SLACK_CONTROL_ROOM_ID }}"
 
 # disabled -- 2020/12 because we never used it
-matrix_jitsi_enabled: false
+jitsi_enabled: false
 
 # added by jlj -- 2020/12
 # discord bridging
@@ -71,11 +71,11 @@ matrix_mx_puppet_steam_enabled: true
 
 # Run `bash inventory/scripts/jitsi-generate-passwords.sh` to generate these passwords,
 # or define your own strong passwords manually.
-matrix_jitsi_jicofo_component_secret: "{{ MATRIX_JITSI_JICOFO_COMPONENT_SECRET }}"
-matrix_jitsi_jicofo_auth_password: "{{ MATRIX_JITSI_JICOFO_AUTH_PASSWORD }}"
-matrix_jitsi_jvb_auth_password: "{{ MATRIX_JITSI_JVB_AUTH_PASSWORD }}"
-matrix_jitsi_jibri_recorder_password: "{{ MATRIX_JITSI_JIBRI_RECORDER_PASSWORD }}"
-matrix_jitsi_jibri_xmpp_password: "{{ MATRIX_JITSI_JIBRI_XMPP_PASSWORD }}"
+jitsi_jicofo_component_secret: "{{ MATRIX_JITSI_JICOFO_COMPONENT_SECRET }}"
+jitsi_jicofo_auth_password: "{{ MATRIX_JITSI_JICOFO_AUTH_PASSWORD }}"
+jitsi_jvb_auth_password: "{{ MATRIX_JITSI_JVB_AUTH_PASSWORD }}"
+jitsi_jibri_recorder_password: "{{ MATRIX_JITSI_JIBRI_RECORDER_PASSWORD }}"
+jitsi_jibri_xmpp_password: "{{ MATRIX_JITSI_JIBRI_XMPP_PASSWORD }}"
 
 # added by jlj -- this has to be defined here too, dumb.
 ansible_become_pass: "{{ ANSIBLE_BECOME_PASS }}"
@@ -118,19 +118,22 @@ matrix_appservice_webhooks_log_level: 'info'
 matrix_dimension_access_token: "{{ vault_matrix_dimension_access_token }}"
 
 # stats shit
-matrix_prometheus_enabled: true
-matrix_prometheus_node_exporter_enabled: true
-matrix_grafana_enabled: true
-matrix_grafana_anonymous_access: false
+prometheus_enabled: true
+prometheus_node_exporter_enabled: true
+grafana_enabled: true
+grafana_anonymous_access: false
 
 ## This has no relation to your Matrix user id. It can be any username you'd like.
 ## Changing the username subsequently won't work.
-matrix_grafana_default_admin_user: "{{ vault_matrix_grafana_default_admin_user }}"
+grafana_default_admin_user: "{{ vault_matrix_grafana_default_admin_user }}"
 
 ## Changing the password subsequently won't work.
-matrix_grafana_default_admin_password: "{{ vault_matrix_grafana_default_admin_password }}"
+grafana_default_admin_password: "{{ vault_matrix_grafana_default_admin_password }}"
 
 ## explicitly enable postgres exporter to get db stats, too
-matrix_prometheus_postgres_exporter_enabled: true
+prometheus_postgres_exporter_enabled: true
 
 matrix_homeserver_generic_secret_key: "{{ matrix_synapse_macaroon_secret_key }}"
+
+matrix_playbook_reverse_proxy_type: playbook-managed-traefik
+devture_traefik_config_certificatesResolvers_acme_email: "{{ VAULT_MATRIX_SSL_LETS_ENCRYPT_SUPPORT_EMAIL }}"