Move matrix vars into defaults

This commit is contained in:
Salt 2020-06-24 07:15:05 -05:00
parent 2bf650657e
commit b023bc1ea1
2 changed files with 3 additions and 6 deletions

View File

@ -24,7 +24,6 @@ mysql_root_password: !vault |
## WEBAPPS ## WEBAPPS
# Dokuwiki # Dokuwiki
dokuwiki_url: "wiki.9iron.club" dokuwiki_url: "wiki.9iron.club"
# Gitea # Gitea
gitea_mysql_password: !vault | gitea_mysql_password: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
@ -48,7 +47,6 @@ gitea_admin_password: !vault |
35313266376539366134343562626164616666306338343538663361393964626565303331383234 35313266376539366134343562626164616666306338343538663361393964626565303331383234
3565646664333966650a323530356664366262653763363439613534303764366436376634373639 3565646664333966650a323530356664366262653763363439613534303764366436376634373639
62303264653836656162366362316461656363353539343632616462626231643632 62303264653836656162366362316461656363353539343632616462626231643632
# Grafana # Grafana
grafana_mysql_password: !vault | grafana_mysql_password: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
@ -59,13 +57,11 @@ grafana_mysql_password: !vault |
33303465616532313339393634386166363162393661393037323835323035386663 33303465616532313339393634386166363162393661393037323835323035386663
grafana_url: "monitor.9iron.club" grafana_url: "monitor.9iron.club"
grafana_webroot: "/var/www/grafana" grafana_webroot: "/var/www/grafana"
# Matrix # Matrix
matrix_server_name: "9iron.club" matrix_server_name: "9iron.club"
matrix_url: "matrix.9iron.club" matrix_url: "matrix.9iron.club"
matrix_webroot: "/var/www/riot"
matrix_enable_registration: "true" matrix_enable_registration: "true"
matrix_admin_contact:"mailto:rehashedsalt@cock.li"
# Nextcloud # Nextcloud
nextcloud_mysql_password: !vault | nextcloud_mysql_password: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256

View File

@ -1,4 +1,5 @@
# vim:ft=ansible: # 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_disabled_message: "Matrix on this server is down for maintenance"
matrix_enable_registration: "false" matrix_enable_registration: "false"
matrix_webroot: "/var/www/riot"