app/matrix: disable piwik & 3pid auth, allow guest login, fix roomDirectory

master
informatic 2019-05-15 11:41:21 +02:00
parent a222691ca5
commit 4b4231d900
1 changed files with 8 additions and 13 deletions

View File

@ -18,7 +18,7 @@ local postgres = import "../../kube/postgres.libsonnet";
},
metadata(component):: {
namespace: app.cfg.namespace,
namespace: cfg.namespace,
labels: {
"app.kubernetes.io/name": "matrix",
"app.kubernetes.io/managed-by": "kubecfg",
@ -26,7 +26,7 @@ local postgres = import "../../kube/postgres.libsonnet";
},
},
namespace: kube.Namespace(app.cfg.namespace),
namespace: kube.Namespace(cfg.namespace),
postgres: postgres {
cfg+: {
@ -66,9 +66,10 @@ local postgres = import "../../kube/postgres.libsonnet";
http: { containerPort: 8008 },
},
env_: {
SYNAPSE_SERVER_NAME: app.cfg.serverName,
SYNAPSE_SERVER_NAME: cfg.serverName,
SYNAPSE_REPORT_STATS: "no",
SYNAPSE_NO_TLS: "1",
SYNAPSE_ALLOW_GUEST: "yes",
POSTGRES_HOST: "postgres",
POSTGRES_USER: app.postgres.cfg.username,
@ -90,16 +91,16 @@ local postgres = import "../../kube/postgres.libsonnet";
metadata+: app.metadata("riot-web-config"),
data: {
"config.json": std.manifestJsonEx({
"default_hs_url": "https://matrix.hackerspace.pl",
"default_is_url": "https://vector.im",
"default_hs_url": "https://%s" % [cfg.domain],
"disable_custom_urls": false,
"disable_guests": false,
"disable_login_language_selector": false,
"disable_3pid_login": false,
"disable_3pid_login": true,
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
"feature_groups": "labs",
@ -110,16 +111,10 @@ local postgres = import "../../kube/postgres.libsonnet";
"default_theme": "light",
"roomDirectory": {
"servers": [
"matrix.hackerspace.pl"
"hackerspace.pl"
]
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
"url": "https://piwik.riot.im/",
"whitelistedHSUrls": ["https://matrix.org"],
"whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
"siteId": 1
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
}