From b023bc1ea15e706884e794f0c586b9c966fb9665 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 24 Jun 2020 07:15:05 -0500
Subject: [PATCH] Move matrix vars into defaults

---
 inventory/group_vars/9iron.yml | 6 +-----
 roles/matrix/defaults/main.yml | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/inventory/group_vars/9iron.yml b/inventory/group_vars/9iron.yml
index 340d30e..51a91d4 100644
--- a/inventory/group_vars/9iron.yml
+++ b/inventory/group_vars/9iron.yml
@@ -24,7 +24,6 @@ mysql_root_password: !vault |
 ## WEBAPPS
 # Dokuwiki
 dokuwiki_url: "wiki.9iron.club"
-
 # Gitea
 gitea_mysql_password: !vault |
         $ANSIBLE_VAULT;1.1;AES256
@@ -48,7 +47,6 @@ gitea_admin_password: !vault |
         35313266376539366134343562626164616666306338343538663361393964626565303331383234
         3565646664333966650a323530356664366262653763363439613534303764366436376634373639
         62303264653836656162366362316461656363353539343632616462626231643632
-
 # Grafana
 grafana_mysql_password: !vault |
         $ANSIBLE_VAULT;1.1;AES256
@@ -59,13 +57,11 @@ grafana_mysql_password: !vault |
         33303465616532313339393634386166363162393661393037323835323035386663
 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"
-
+matrix_admin_contact:"mailto:rehashedsalt@cock.li"
 # Nextcloud
 nextcloud_mysql_password: !vault |
         $ANSIBLE_VAULT;1.1;AES256
diff --git a/roles/matrix/defaults/main.yml b/roles/matrix/defaults/main.yml
index dfb75d2..90862ed 100644
--- a/roles/matrix/defaults/main.yml
+++ b/roles/matrix/defaults/main.yml
@@ -1,4 +1,5 @@
 # vim:ft=ansible:
-matrix_admin_contact: "mailto:rehashedsalt@cock.li"
+matrix_admin_contact: "mailto:noreply@server.example"
 matrix_disabled_message: "Matrix on this server is down for maintenance"
 matrix_enable_registration: "false"
+matrix_webroot: "/var/www/riot"