Dan Arnfield
df82ec13b2
docker-ce is now available for Debian Bullseye
3 years ago
Wolfgang Winter
d0b557eb6f
Replace tabs to spaces to prevent problems in YAML
3 years ago
Slavi Pantaleev
f5a2d732ea
Merge pull request #1224 from GoMatrixHosting/master
...
GoMatrixHosting v0.5.7
3 years ago
Wolfgang Winter
7486db0d1a
Missing ticks
3 years ago
WobbelTheBear
f988fd3339
Change sequence of permissions
...
As per earlier comment (see from tulir) the sequence has been changed.
3 years ago
WobbelTheBear
d249fe874e
Update roles/matrix-bridge-mautrix-signal/templates/config.yaml.j2
...
Updated settings in template file:
* relay for any user
* user permissions only for HS domain users
Co-authored-by: Jan <31133207+Jaffex@users.noreply.github.com>
3 years ago
WobbelTheBear
ae9639585c
Update roles/matrix-bridge-mautrix-signal/defaults/main.yml
...
Improved setup through template file
Co-authored-by: Jan <31133207+Jaffex@users.noreply.github.com>
3 years ago
Wolfgang Winter
a34241e4cc
Remove intial permissions seting
...
Permissions, when set in the template, will be augmented rahter than replaced when using matrix_mautrix_signal_configuration_extension_yaml. Therefore, permissions shall only be set in the defaults/vars.yml or in the HS specific vars.yml file
3 years ago
Wolfgang Winter
5ca28ba872
Default relay bot functionality setting
...
Per default relay bot functionality is disabled; the bridge user permissions depends on the relay bot, if enabled the base domain users are on level relay, else remain on user;
3 years ago
Wolfgang Winter
e6b77284f2
Relay bot configurable + permissions
...
Enable / disable relay bot functionality as configuratoin paramter; set bridge permissions for base domain users to user level
3 years ago
Michael Collins
98e6cd685d
sync with previous repo
3 years ago
Jaffex
e90b33c4e3
Update matrix-mautrix-signal config to 0.2.0 to enable relay mode
3 years ago
Michael Collins
4c12c1892c
use saner folder permissions
3 years ago
Michael Collins
4d57a41b3f
remove matrix_awx_enabled from these
3 years ago
Michael Collins
2e30802b87
use group variables instead
3 years ago
Michael Collins
8238d65e5f
simplify template conditional
3 years ago
Toni Spets
bce94c5860
Allow configuring synapse database transaction limit
3 years ago
Slavi Pantaleev
05ad620386
Update homeserver.yaml to keep up with Synapse v1.40.0
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1225
3 years ago
WobbelTheBear
2469ada520
Update Synapse (1.39.0 -> 1.40.0)
3 years ago
Michael Collins
bfb61e776e
GMH v0.5.7... maybe!
3 years ago
Sebastian Gumprich
24589b91f4
irc appservice image tag has a 'v' now
3 years ago
Slavi Pantaleev
6de8b5925a
Merge pull request #1222 from wol-win/feature/signal
...
New version of Mautrix Signal bridge (version 0.2.0)
3 years ago
Wolfgang Winter
6ecfbe98b1
New version of Mautrix Signal bridge version 0.2.0 provided through new GitLab repository location
3 years ago
Thom Wiggers
d11d6f52ae
Update IRC appservice
...
https://github.com/matrix-org/matrix-appservice-irc/releases/tag/0.29.0
3 years ago
Sebastian Gumprich
d2a1b8b134
whatsapp bridge has new docker image location
...
See https://github.com/mautrix/whatsapp/releases/tag/v0.1.8
3 years ago
Slavi Pantaleev
2e23166ed3
Merge pull request #1216 from aaronraimist/hydrogen
...
Upgrade Hydrogen (0.2.3 -> 0.2.5)
3 years ago
Aaron Raimist
f3aae70f70
Upgrade Hydrogen (0.2.3 -> 0.2.5)
3 years ago
Slavi Pantaleev
23006fd64e
Fix email2matrix path initialization
...
Regression since 421f85defa
3 years ago
Slavi Pantaleev
421f85defa
Add self-building support to matrix-email2matrix
3 years ago
Slavi Pantaleev
2697590d28
Remove some useless if conditions
3 years ago
Slavi Pantaleev
a68ac9cb4f
Split install/uninstall tasks in matrix-email2matrix
3 years ago
Slavi Pantaleev
5fc61ed964
Upgrade Element (1.7.33 -> 1.7.34)
3 years ago
Slavi Pantaleev
179775b92d
Upgrade Synapse (1.38.1 -> 1.39.0)
3 years ago
Slavi Pantaleev
dfa7b6e4fd
Merge pull request #1171 from BackInBash/patch-1
...
Updating to ma1sd v2.5.0
3 years ago
Slavi Pantaleev
676101e999
Minor fixups for ma1sd 2.5.0
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1171
3 years ago
Michael Collins
67db5a0024
GoMatrixHosting v0.5.5
3 years ago
Slavi Pantaleev
49abe66f1d
Remove unnecessary if condition
...
All of `setup_install.yml` only runs if `matrix_bot_matrix_reminder_bot_enabled`,
so it's not necessary to add that condition once again.
3 years ago
Nate
012440c309
Allow for self-building of reminder-bot
3 years ago
Hardy Erlinger
03e8c75a30
Restore authentication for Jitsi Meet.
3 years ago
sakkiii
4a2b169fc9
systemd-timesyncd for ubuntu
3 years ago
sakkiii
f4a9c4dff2
Update prometheus node exporter (1.1.2 -> 1.2.0)
3 years ago
Slavi Pantaleev
112d8d8243
Upgrade Synapse (1.38.0 -> 1.38.1)
3 years ago
sakkiii
7f0b8fef0a
Merge branch 'spantaleev:master' into patch-1
3 years ago
Slavi Pantaleev
31244e7fcc
Merge pull request #1180 from Toorero/master
...
Fixed self-build functionality for mautrix-signal
3 years ago
Slavi Pantaleev
7d9ee3e2fb
Remove unnecessary if-condition
3 years ago
Slavi Pantaleev
a21696f687
Fix some if-checks
...
We'd rather not suppress pull errors or run self-build tasks if pulling fails.
3 years ago
Toorero
ead4b00c09
Reverted back to manual self-build detection
3 years ago
Slavi Pantaleev
30339cd313
Merge pull request #1139 from sakkiii/jitsi-fix
...
Jitsi Update -> stable-5963
3 years ago
sakkiii
d08a78ff1f
remove prosody JICOFO_COMPONENT_SECRET
3 years ago
Slavi Pantaleev
4105ba854b
Merge pull request #1147 from datenkollektiv-net/allow-custom-federation-fqn
...
Make federation domain customizable
3 years ago
Slavi Pantaleev
25e6eb27ab
Merge pull request #1183 from Toorero/mautrix-telegram-selfbuild-fix
...
Fixed mautrix-telegram selfbuild not working on non amd64 platforms
3 years ago
Slavi Pantaleev
fb221c8179
Do not needlessly ignore errors
3 years ago
Slavi Pantaleev
51b94d9987
Merge pull request #1194 from meyerrj/master
...
Update main.yml for matrix-reminder-bot
3 years ago
Slavi Pantaleev
931b16fa66
Merge pull request #1193 from sakkiii/patch-2
...
Upgrade hydrogen (v0.2.0 -> v0.2.3)
3 years ago
JokerGermany
9345d840be
root path for the base domain is wrong ( #1189 )
...
* root path for the base domain
* Fix path when running in a container
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
3 years ago
Richard Meyer
a8373d6bd4
Update main.yml
...
Fixes an issue related to https://github.com/anoadragon453/matrix-reminder-bot/issues/86
3 years ago
sakkiii
8b304445e5
Upgrade hydrogen (v0.2.0 -> v0.2.3)
3 years ago
sakkiii
5209a17da1
migrate from ntp to chrony
3 years ago
Slavi Pantaleev
70cb27138c
Upgrade Element (1.7.32 -> 1.7.33)
3 years ago
Toorero
b3793f3595
Masked TARGETARCH via docker.build.arg directive
3 years ago
Toorero
3a28100131
Renamed matrix_lottieconverter to matrix_telegram_lottieconverter
3 years ago
Toorero
7f15787d54
Fixed mautrix-telegram selfbuild not working on non amd64 platforms
3 years ago
Toorero
f933ba14ae
Fixed self-build functionality for mautrix-signal and added self-build functionality for signald
3 years ago
sakkiii
e90979e91f
Upgrade grafana (8.0.5 -> 8.0.6)
3 years ago
Slavi Pantaleev
a435c64c13
Merge pull request #1176 from GoMatrixHosting/master
...
GoMatrixHosting v0.5.4
3 years ago
Michael-GMH
86e4649578
GoMatrixHosting v0.5.5
3 years ago
Michael-GMH
03006eb5ab
GoMatrixHosting v0.5.5
3 years ago
Michael-GMH
245986c793
Merge remote-tracking branch 'upstream/master'
3 years ago
Toorero
f732a75ca5
Added selfbuild functionality to mautrix-signal bridge
3 years ago
Janar Juusu
c198320f65
feat: update synapse to 1.38.0
3 years ago
Slavi Pantaleev
2e0eddde9d
Upgrade matrix-corporal (2.1.0 -> 2.1.1)
3 years ago
Markus
83b9908c9d
Update to ma1sd v2.5.0
3 years ago
sakkiii
cd54147144
Upgrade grafana (8.0.3 -> 8.0.5)
3 years ago
sakkiii
7a51268dfc
Upgrade certbot & nginx
...
Upgrade certbot (v1.16.0 -> v1.17.0) nginx (1.21.0 -> 1.21.1)
3 years ago
Slavi Pantaleev
3fa895fe96
Upgrade Element (1.7.31 -> 1.7.32)
3 years ago
Michael-GMH
f6e0cbe5f3
did i even update this
3 years ago
sakkiii
49455a9ce0
prometheus version 2.28.0 -> 2.28.1
3 years ago
Michael-GMH
1c938c72fd
GoMatrixHosting 0.5.2
3 years ago
Slavi Pantaleev
b4d7ab0b53
Merge pull request #1153 from Cadair/worker_prom
...
Add worker metrics to prometheus exporter
3 years ago
Slavi Pantaleev
b6d71b9da1
Fix self-building for Coturn
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1158
3 years ago
Neutron
1ad9bba88f
Skip importing validate_config task when Synapse is disabled
3 years ago
Stuart Mumford
2aa457efcc
Use a prom variable and not a synapse role variable
3 years ago
Michael-GMH
7acaef89df
GoMatrixHosting v0.5.1
3 years ago
Slavi Pantaleev
ccde2362fc
Merge branch 'master' into mjolnir-0.1.18
3 years ago
Slavi Pantaleev
55452c3068
Update Mjolnir (v0.1.17 -> v0.1.18)
3 years ago
Aaron Raimist
fc16fbda5b
Remove a bunch of redundant Ansible <2.8 self building checks
3 years ago
Aaron Raimist
19ed8d1d17
Upgrade mjolnir (0.1.17 -> 0.1.18) and implement self building
3 years ago
sak
7b2211da8e
remove jibri
3 years ago
Slavi Pantaleev
6294e58304
Fix Content-Security-Policy for Element
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1154
According to
https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy ,
having both a header and the `<meta>`-tag provided by Element itself is
not a problem. The 2 CSP policies get combined.
3 years ago
Stuart Mumford
09ee5ce52e
we index from 0 apparently
3 years ago
Stuart Mumford
3d063f6ace
make them show as jobs in grafana
3 years ago
oxmie
5df4d68829
Make federation domain customizable
3 years ago
Stuart Mumford
7b52e6ad5e
Add worker metrics to prometheus exporter
3 years ago
Davy Landman
c9d73c6606
Updating to latest synapse release (performance regression)
...
https://github.com/matrix-org/synapse/releases/tag/v1.37.1
3 years ago
sakkiii
d338090f00
postgres minor updates
3 years ago
Slavi Pantaleev
3da4b684a5
Upgrade Synapse (1.36.0 -> 1.37.0)
3 years ago
Thom Wiggers
eb5619fd4b
Update IRC bridge
3 years ago
Michael Sasser
7578a355c4
heisenbridge fix service name
3 years ago
sakkiii
8a369f61f3
Merge branch 'spantaleev:master' into jitsi-fix
3 years ago
hanthor
ddbb4b2acc
Update main.yml
...
update to v0.2.0
3 years ago
Slavi Pantaleev
2d740dbebd
Mount /data in matrix-redis container
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1140
3 years ago
sakkiii
2b881e245b
Update prometheus v2.27.1 -> v2.28.0
3 years ago
sakkiii
0cc17ab2ca
matrix_jitsi_jicofo_component_secret validation
3 years ago
sakkiii
f2f1b20e44
jicofo client proxy connection
3 years ago
sakkiii
b132941e71
Merge branch 'spantaleev:master' into jitsi-fix
3 years ago
Slavi Pantaleev
18533b5000
Merge pull request #1135 from sakkiii/patch-1
...
Coturn update 4.5.2 -> 4.5.2-r2
3 years ago
Slavi Pantaleev
d019e9078a
Remove unused variables from mx-puppet-* bridges
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1131
3 years ago
sakkiii
6ede9c8cd6
network-alias added to fix domains
3 years ago
sakkiii
d9e943aaaa
minor fix
3 years ago
sakkiii
0c8a3c401f
jibri service
3 years ago
sakkiii
04805f35a7
Coturn update 4.5.2 -> 4.5.2-r2
3 years ago
Slavi Pantaleev
b19fa3acb2
Upgrade Element (1.7.30 -> 1.7.31)
3 years ago
sakkiii
1250208907
whitespaces
3 years ago
sakkiii
c0cd2a3c93
JICOFO_RESERVATION_ENABLED contains whitespaces.
3 years ago
sakkiii
f8be36327c
jibri service
3 years ago
sakkiii
3e011bafd5
jibri env
3 years ago
sakkiii
8af2d818b1
domain_fix
3 years ago
sakkiii
2ca92b76b6
stable-5963
3 years ago
Slavi Pantaleev
5a1dabe14f
Bump exim-relay Docker image tag
...
The new one is based on Alpine 3.14, instead of Alpine 3.13.
3 years ago
Slavi Pantaleev
282844209a
Merge pull request #1105 from blaztinn/centos-stream-8
...
Add support for CentOS (Stream) 8
3 years ago
Marcel Ackermann
a790096adf
matrix_mx_puppet_slack_client_id deprecated
3 years ago
Marcel Ackermann
ed078998b5
deprecated
3 years ago
Slavi Pantaleev
efa7486b88
Merge pull request #1127 from sakkiii/patch-3
...
Content-Security-Policy For Element Web
3 years ago
sakkiii
b826171139
Update grafana 8.0.2 -> 8.0.3
4 years ago
sakkiii
0217644b48
Content-Security-Policy For Element Web
...
https://github.com/vector-im/element-web#configuration-best-practices
4 years ago
Slavi Pantaleev
3dd32d2512
Update worker endpoints
...
Should have been part of 9daeb39710
4 years ago
Slavi Pantaleev
9daeb39710
Upgrade Synapse (1.35.1 -> 1.36.0)
4 years ago
Michael-GMH
4fb1134ad1
GoMatrixHosting v0.5.0
4 years ago
Slavi Pantaleev
a7fcb7c04d
Merge pull request #1122 from sakkiii/patch-2
...
update hydrogen v0.1.56 -> v0.1.57
4 years ago
sakkiii
4cd5835e11
update hydrogen v0.1.56 -> v0.1.57
...
https://github.com/vector-im/hydrogen-web/releases/tag/v0.1.57
4 years ago
sakkiii
08d1a5c2e7
Update grafana 8.0.0 -> 8.0.2
4 years ago
Blaž Tomažič
72bc9b5cfc
Add support for CentOS (Stream) 8
4 years ago
Slavi Pantaleev
1cf4d5ea7f
Upgrade Redis (6.0.10 -> 6.2.4)
4 years ago
Slavi Pantaleev
963f38ee7b
Upgrade certbot (v1.14.0 -> v1.16.0)
4 years ago
SkepticalWaves
2e8a2bdf7d
Add empty default for jitsi-prosody modules
4 years ago
SkepticalWaves
2886dc3939
Add module configuration to jitsi-prosody env file
4 years ago
Slavi Pantaleev
6c9c78ddae
Merge pull request #1112 from sakkiii/patch-2
...
coturn update
4 years ago
sakkiii
be1d1d0b7c
matrix_grafana_content_security_policy_customized default false
4 years ago
sakkiii
2d9ba82337
Update element 7.5.7 -> 8.0.0
4 years ago
sakkiii
1cc1202df2
update coturn
4 years ago
rakshazi
77fd1bff22
Update element 1.7.29 -> 1.7.30
4 years ago
Slavi Pantaleev
fa76c1ee5b
Do not run self-build Ansible version-check, if component not enabled
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1108
4 years ago
Slavi Pantaleev
bec9eaeb50
Merge pull request #1108 from tommes0815/fix-hydrogen-for-ansible2.7
...
fix error when running with Ansible 2.7 in the hydrogen setup
4 years ago
Thom Wiggers
3c05cc04bc
Update IRC appservice
4 years ago
Thomas Kühne
7f4e71b22a
fix error when running with Ansible 2.7 in the hydrogen setup
...
Without this the hydrogen task would fail for Ansible 2.7 even when hydrogen is not enabled.
4 years ago
Michael-GMH
122a92fa1c
GoMatrixHosting v0.4.9 update
4 years ago
Slavi Pantaleev
b1f1c28ef0
Upgrade Synapse (1.34.0 -> 1.35.0)
4 years ago
Michael-GMH
ad7bbd6442
merge upstream
4 years ago
Michael-GMH
6f40d78353
fix random edits to upstream
4 years ago
Michael-GMH
ea6e344d05
merge upstream
4 years ago
Michael-GMH
85777e8f96
merge with upstream
4 years ago
Slavi Pantaleev
1ed0857019
Fix syntax error
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1024
4 years ago
sakkiii
4a4a7f136e
changes added to hydrogen client
4 years ago
sakkiii
25e67b51d1
Merge branch 'spantaleev:master' into master
4 years ago
sakkiii
3436f9c10a
rename to matrix_nginx_proxy_hsts_preload_enabled
4 years ago
Slavi Pantaleev
0648b1b618
Upgrade Element (1.7.28 -> 1.7.29)
4 years ago
sakkiii
7cc5328ede
Comments & Ref
4 years ago
sakkiii
df2d91970d
matrix_nginx_proxy_xss_protection
4 years ago
Slavi Pantaleev
d4c7a90b5c
Merge pull request #1076 from Eagle-251/Jitsi-Prosody-OwnNginxCompatibility
...
Allow Jitsi XMPP websocket support for users using own webserver.
4 years ago
ewang
409cd2b9a3
Source port binding from group vars in line other components
4 years ago
Eagle-251
ef6a7e051c
Fix missing port binding.
4 years ago
ewang
1bb6ed97ae
Make port bindings default for those disabling nginx proxy
...
I changed the conditional statement in prosody systemd template to bind the localhost port by default if people have set ```matrix_nginx_proxy_enabled == false ```.
Hopefully that should make it the default behaviour now.
4 years ago
Aaron Raimist
3c0452ff5a
Remove unnecessary bind for config.json, use proper nginx.conf
4 years ago
ewang
4a772e50f4
Allow Jitsi XMPP webscoket support for users using own webserver.
...
Added:
- Conditional localhost Port bindings for Jitsi Prosody systemd template
- Added variable to main.yml to allow overriding from vars.yml
4 years ago
Slavi Pantaleev
6f80292745
Add OCSP stapling support and other SSL optimizations to Hydrogen vhost
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1061
and https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1057
4 years ago
Slavi Pantaleev
d0de21ab34
Delete Hydrogen nginx configuration file when disabled
4 years ago
Aaron Raimist
ac4ede20af
Add docs
4 years ago
Aaron Raimist
1633f61018
Only install config.json when self building
4 years ago
Aaron Raimist
04548f8df2
Merge branch 'master' into hydrogen
4 years ago
Aaron Raimist
9437f78c9e
Build using custom config.json, add CSP, update to 0.1.53
4 years ago
Slavi Pantaleev
47b4608b96
Fail in a friendlier way when trying to self-build on Ansible <= 2.8
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
Related discussion here: 1ab507349c (commitcomment-51108407)
4 years ago
Slavi Pantaleev
1ab507349c
Fix self-building for various components on Ansible < 2.8
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
4 years ago
Slavi Pantaleev
66615c43a3
Merge pull request #1065 from sakkiii/patch-1
...
Update grafana (7.5.6->7.5.7)
4 years ago
Tobias K
3dcbed6353
roles/matrix-grafana: Set root_url in granafa.ini
4 years ago
sakkiii
8529ca4c17
Update grafana (7.5.6->7.5.7)
4 years ago
Slavi Pantaleev
073d920a62
Merge pull request #1061 from sakkiii/ssl_enhancement
...
Optimize SSL session
4 years ago
Toni Spets
544915ff76
Add Heisenbridge
4 years ago
Slavi Pantaleev
21eb39f986
Mention matrix_common_after_systemd_service_start_wait_for_timeout_seconds in failure message
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1062
4 years ago
Slavi Pantaleev
ee46fabdca
Make waiting time for --tags=start configurable
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1062
4 years ago
sakkiii
e9b878b9e9
Optimize SSL session
4 years ago
Slavi Pantaleev
e6afa05f7b
Enable OCSP stapling for the federation port
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1057
Not sure if this is beneficial though.
4 years ago
Slavi Pantaleev
57a6a98a50
Fix incorrect SSL certificate path
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1057
4 years ago
Slavi Pantaleev
b9c4e8ce16
Merge pull request #1057 from sakkiii/ssl_staple
...
Enable OCSP Stapling
4 years ago
sakkiii
d31b55b2a7
SSL-enabled block only
4 years ago
rakshazi
400371f6dd
Updated Element version (1.7.27 -> 1.7.28)
4 years ago
Slavi Pantaleev
d156c8caa2
Upgrade Synapse (1.33.2 -> 1.34.0)
4 years ago
Slavi Pantaleev
e4dd933cf0
Make missing /_synapse/admin correctly return 404 responses
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1058
We may try to capture such calls and return a friendlier response (HTML
or JSON) saying "The Synapse Admin API is not enabled", but that may not
be desirable.
For now, we stick to what "upstream" recommends: "simply
don't proxy these APIs", which should lead to the same kind of 404 that
we have now.
See here: 6660912226/docs/reverse_proxy.md (synapse-administration-endpoints)
4 years ago
sakkiii
2c3da6599b
Added warning
4 years ago
sakkiii
0dd4459799
matrix_nginx_proxy_ocsp_stapling_enabled variable added
4 years ago
sakkiii
c05021640d
Enable OCSP Stapling
4 years ago
Aaron Raimist
ca361af616
Add Hydrogen
4 years ago
sakkiii
b191e461a5
Merge branch 'spantaleev:master' into master
4 years ago
sakkiii
4bd7d8b5e4
Update grafana (7.5.5->7.5.6)
4 years ago
sakkiii
d5cd3d443d
Update prometheus (2.26.0->2.27.0)
4 years ago
sakkiii
322b750aad
Merge branch 'spantaleev:master' into master
4 years ago
Slavi Pantaleev
f481b1a84b
Upgrade matrix-mailer (4.94.2-r0 -> 4.94.2-r0-1)
...
Related to https://github.com/devture/exim-relay/pull/9
4 years ago
Slavi Pantaleev
8e6f1876f5
Switch to :latest version of synapse-admin
...
Related to https://github.com/Awesome-Technologies/synapse-admin/issues/132
We should switch back when >0.8.0 gets released.
4 years ago
sakkiii
8fc55b30c5
Upgrade Synapse (1.33.1 -> 1.33.2)
...
This release fixes a denial of service attack (CVE-2021-29471) against Synapse's push rules implementation. Server admins are encouraged to upgrade.
Ref: https://github.com/matrix-org/synapse/releases/tag/v1.33.2
4 years ago
Slavi Pantaleev
2d4b039c55
Merge pull request #1046 from GoMatrixHosting/master
...
GoMatrixHosting v0.4.6
4 years ago
Michael-GMH
2b4bada72a
fix conditional
4 years ago
Michael-GMH
0adcef65e6
fix conditional
4 years ago
Michael-GMH
f70102e40c
no dashes in usernames
4 years ago
Slavi Pantaleev
f4657b2cdb
Upgrade Element (1.7.26 -> 1.7.27)
4 years ago
Michael-GMH
4e6f6e179b
GMH 0.4.6 update
4 years ago
sakkiii
29cf6a0087
Merge branch 'spantaleev:master' into master
4 years ago
Slavi Pantaleev
3dcc006932
Fix self-building for Coturn
...
689dcea773
wasn't enough. The `upstream/..` tags are
just upstream sources, without the alpine-based Dockerfile.
We need to use the `docker/..` tags for that (or `master`)
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1032
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1023
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1009
4 years ago
Slavi Pantaleev
33f0074862
Upgrade matrix-mailer (4.94-r0 -> 4.94.2-r0)
...
Related to https://github.com/devture/exim-relay/issues/6
4 years ago
Slavi Pantaleev
c19508087a
Merge pull request #1036 from sakkiii/grafana-csp
...
Grafana csp template backward compatible with older browsers
4 years ago
Slavi Pantaleev
a198b87455
Upgrade synapse-admin (0.7.2 -> 0.8.0)
...
Related to https://github.com/Awesome-Technologies/synapse-admin/issues/132
4 years ago
Slavi Pantaleev
867ebb52ab
Merge pull request #1037 from pushytoxin/jitsi-5765-1
...
Update Jitsi (5142 -> 5765-1)
4 years ago
sakkiii
bb0810302d
Merge branch 'spantaleev:master' into master
4 years ago
Slavi Pantaleev
61220ea487
Upgrade Synapse (1.33.0 -> 1.33.1)
4 years ago
sakkiii
9174448e5e
get rid of this {% else %}
4 years ago
sakkiii
0d5fe2d9f7
Update roles/matrix-grafana/templates/grafana.ini.j2
...
Co-authored-by: Aaron Raimist <aaron@raim.ist>
4 years ago
Béla Becker
b10655ebb1
Jitsi XMPP Websocket support
...
Jitsi-meet enabled websockets by default, claiming better reliability.
Matrix-nginx-proxy configuration has been set up according to the
Prosody documentation: https://prosody.im/doc/websocket
4 years ago
Béla Becker
116bcaa13b
Update jitsi to stable-5765-1
...
Changelog:
https://github.com/jitsi/docker-jitsi-meet/blob/stable-5765-1/CHANGELOG.md
4 years ago
sakkiii
37de7fc96a
Updated Reference
4 years ago
sakkiii
303de935d5
grafana CSP backward compatible with older browsers
4 years ago
Slavi Pantaleev
d4d1e2e922
Upgrade Synapse (1.32.2 -> 1.33.0)
4 years ago
Slavi Pantaleev
b09a805939
Merge pull request #1031 from thedanbob/nginx-1.20.0
...
Update nginx (1.19.10 -> 1.20.0)
4 years ago
Slavi Pantaleev
6fdc71c40b
Merge pull request #1030 from thedanbob/grafana-7.5.5
...
Update grafana (7.5.4 -> 7.5.5)
4 years ago
Dan Arnfield
cfaa3e598a
Update nginx (1.19.10 -> 1.20.0)
4 years ago
Dan Arnfield
bec5933db4
Update grafana (7.5.4 -> 7.5.5)
4 years ago
Michael-GMH
067b61e779
GoMatrixHosting v0.4.5 update
4 years ago
Slavi Pantaleev
2409c33ea2
Upgrade Element (1.7.25 -> 1.7.26)
4 years ago
benkuly
49cb2635a2
updated matrix-sms-bridge
4 years ago
Michael-GMH
a14bf6c2ed
GoMatrixHosting v0.4.4 update
4 years ago
Slavi Pantaleev
689dcea773
Fix self-building for Coturn
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1023
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1009
4 years ago
sakkiii
40fe6bd5c1
variable matrix_nginx_proxy_hsts_preload_enable added
4 years ago
Slavi Pantaleev
389dc26615
Fix Synapse generic worker balancing
...
Potentially fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1022
4 years ago
sakkiii
5b4fdf9b87
Merge branch 'master' of https://github.com/sakkiii/matrix-docker-ansible-deploy
4 years ago
sakkiii
0ccf0fbf1c
HSTS preload + X-XSS enables
...
**HSTS Preloading:**
In its strongest and recommended form, the [HSTS policy](https://www.chromium.org/hsts ) includes all subdomains, and indicates a willingness to be “preloaded” into browsers:
`Strict-Transport-Security: max-age=31536000; includeSubDomains; preload`
**X-Xss-Protection:**
`1; mode=block` which tells the browser to block the response if it detects an attack rather than sanitising the script.
4 years ago
sakkiii
3564635f0f
Merge branch 'master' into master
4 years ago
sakkiii
29bba5161b
Element More security headers
...
More Production ready nginx headers for Matrix client element.
4 years ago
Slavi Pantaleev
f6b371164c
Remove useless variable
4 years ago
Slavi Pantaleev
62c0587b6a
Use Alpine-based Coturn
4 years ago
Slavi Pantaleev
72a7cb4145
Merge pull request #1018 from GoMatrixHosting/master
...
GoMatrixHosting v0.4.3
4 years ago
Slavi Pantaleev
e3fa3e12bc
Upgrade Synapse (1.31 -> 1.32.2)
4 years ago
Michael-GMH
50d7209c5b
GMH v04.3
4 years ago
Slavi Pantaleev
378fabf177
Revert "Upgrade Synapse (1.31 -> 1.32.1)"
...
This reverts commit 1fb54a37cb
.
Seems like it's been pulled or something. It used to exist, but not
anymore. Not sure what's going on.
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1017
Related to
https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1010
4 years ago
Slavi Pantaleev
1fb54a37cb
Upgrade Synapse (1.31 -> 1.32.1)
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1010
4 years ago
Slavi Pantaleev
d691cc0920
Move variable definition a bit
4 years ago
Slavi Pantaleev
e00ef04b57
Add opt-out-of-FLoC headers by default
4 years ago
Slavi Pantaleev
42783972fd
Merge pull request #1011 from aaronraimist/synapse-admin
...
Upgrade synapse-admin (0.7.0 -> 0.7.2)
4 years ago
Slavi Pantaleev
ca786cc343
Revert "Upgrade Synapse (1.31 -> 1.32)"
...
This reverts commit f825c7c263
.
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1010
4 years ago
Aaron Raimist
bb64b80697
Upgrade synapse-admin (0.7.0 -> 0.7.2)
4 years ago
Slavi Pantaleev
f825c7c263
Upgrade Synapse (1.31 -> 1.32)
4 years ago
Slavi Pantaleev
7eda6a3c12
Merge pull request #1009 from thedanbob/coturn-official
...
Switch to official coturn image
4 years ago
Slavi Pantaleev
adcecaffaf
Fix connectivity between prometheus and prometheus-node-exporter
...
Expected to have regressed after https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1008
This patch comes with its own downsides (as described in the comments
for matrix_prometheus_node_exporter_container_http_host_bind_port),
but at least there's:
- no security issue
- metrics remain readable from matrix-prometheus (even if the network metrics are inaccurate)
A better patch is certainly welcome.
4 years ago
Dan Arnfield
b2ca1f2829
Add capability required by new image
4 years ago
Slavi Pantaleev
398b9f5d66
Merge pull request #1008 from sakkiii/master
...
security** node-exporter data & port publicly exposed
4 years ago
Dan Arnfield
29177d4922
Switch to official coturn docker image
4 years ago
sak
88a30fb5ed
security** node-exporter data & port publicly exposed
4 years ago
sak
0f9a455719
Revert "security** node-exporter data & port publicly exposed"
...
This reverts commit d0cd709c08
.
4 years ago
sak
d0cd709c08
security** node-exporter data & port publicly exposed
4 years ago
Slavi Pantaleev
4a1739f604
Merge pull request #1007 from teutat3s/fix/nginx-dont-send-version
...
Don't expose nginx version with each response
4 years ago
teutat3s
2bf7c26cfa
Don't expose nginx version with each response
4 years ago
Slavi Pantaleev
c565e72f0d
Merge pull request #1003 from sakkiii/patch-2
...
updated matrix_grafana_docker_image to v7.5.4
4 years ago
Slavi Pantaleev
51b46697c5
Merge pull request #1005 from sakkiii/master
...
Improve security for grafana
4 years ago
Dan Arnfield
f04614a993
Fix prometheus network for ansible < 2.8
4 years ago
Slavi Pantaleev
badd81e0ec
Revert "Attempt to fix docker_network result discrepancy between Ansible versions"
...
This reverts commit 68ca81c8c2
.
4 years ago
sakkiii
1958d0792d
Update matrix-client-element.conf.j2
4 years ago
sakkiii
b6d45c5fd8
Merge branch 'master' of https://github.com/sakkiii/matrix-docker-ansible-deploy
4 years ago
sakkiii
05042f5ff1
Improve security grafana
...
- duplicate X-Content-Type-Options
- X-Frame-Options header
- Referrer-Policy [Might consider adding variable]
- Secure flag with cookies
- matrix_grafana_content_security_policy variable for [Content Security Policy](https://grafana.com/docs/grafana/latest/administration/configuration/#content_security_policy )
4 years ago
sakkiii
27377e099d
updated matrix_grafana_docker_image to v7.5.4
...
Latest stable grafana version is [7.5.4 (2021-04-14)](https://github.com/grafana/grafana/releases/tag/v7.5.4 )
4 years ago
Slavi Pantaleev
68ca81c8c2
Attempt to fix docker_network result discrepancy between Ansible versions
...
Supposedly fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/907
4 years ago
Slavi Pantaleev
9c1f41eadf
Merge pull request #1002 from thedanbob/node-exporter-1.1.2
...
Update prometheus node exporter (1.1.0->1.1.2)
4 years ago
Dan Arnfield
8a550ce67c
Update prometheus (2.24.1->2.26.0)
4 years ago
Dan Arnfield
83cc5c9e6a
Update prometheus node exporter (1.1.0 -> 1.1.2)
4 years ago
sakkiii
5dc642ace1
Nginx element web: XSS protection & nosniff header
...
X-XSS-Protection: 1; mode=block; header, for basic XSS protection in legacy browsers.
X-Content-Type-Options: nosniff header, to disable MIME sniffing
4 years ago
Slavi Pantaleev
fcb9e9618a
Make Coturn TLSv1/v1.1 configurable
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/999
4 years ago
sakkiii
540416e32d
Disable support for TLS 1.0 and TLS 1.1
...
These old versions of TLS rely on MD5 and SHA-1, both now broken, and contain other flaws. TLS 1.0 is no longer PCI-DSS compliant and the TLS working group has adopted a document to deprecate TLS 1.0 and TLS 1.1.
4 years ago
Michael-GMH
89cb5a3d7a
GMH v0.4.2 update
4 years ago
Michael
f41bfb69d2
update survey template formatting
4 years ago
Michael
814bdf5a88
update spelling
4 years ago
Michael
fbe22289bd
merge with upstream and testing branch
4 years ago
Slavi Pantaleev
995c483856
Merge pull request #962 from aaronraimist/mjolnir
...
Add mjolnir
4 years ago
Slavi Pantaleev
f183add44d
Merge pull request #977 from aaronraimist/simple-antispam
...
Upgrade synapse-simple-antispam (0.0.1 -> 0.0.3)
4 years ago
Aaron Raimist
81dddd2e25
Upgrade Element (1.7.24 -> 1.7.24.1)
4 years ago
Aaron Raimist
c43bd412dd
Upgrade synapse-simple-antispam (0.0.1 -> 0.0.3)
4 years ago
Aaron Raimist
1ecee625d5
Depend on more services, add a delay
4 years ago
Slavi Pantaleev
a88391edf5
Merge pull request #972 from JohannesKleine/nginx-config
...
matrix-nginx-proxy: add custom nginx options to nginx.conf.j2
4 years ago
teutat3s
0b5e903693
Updates to mautrix-signal config
...
See these last commits:
tulir/mautrix-signal@4fc34330c1f6947aece67863b0d04da34c776f80
tulir/mautrix-signal@64bc5c36a509ba435a0b01cf44afb1b5d2642efd
tulir/mautrix-signal@ddda1666d41d28750cc59d070e4388b24add6ad9
4 years ago
Christoph Johannes Kleine
fcd66b2889
rename variables
4 years ago
Christoph Johannes Kleine
8ba1105010
rename variable
4 years ago
Christoph Johannes Kleine
3a772f2f65
matrix-nginx-proxy: add custom nginx options to nginx.conf.j2
4 years ago
Slavi Pantaleev
93960b70be
Do not fail if `_matrix-identity` DNS SRV record missing
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/963
This also simplifies Prerequisites, which is great.
It'd be nice if we were doing these checks in some optional manner
and reporting them as helpful messages (using
`matrix_playbook_runtime_results`), but that's more complicated.
I'd rather drop these checks completely.
4 years ago
Slavi Pantaleev
5e1cf7f8b9
Upgrade Element (1.7.23 -> 1.7.24)
4 years ago
Slavi Pantaleev
9409588513
Fix variable name typo (take 2)
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/970
4 years ago
Slavi Pantaleev
179b416ed5
Fix variable name typo
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/970
4 years ago
Slavi Pantaleev
77d598b315
Fix Go-NEB variable definitions using the wrong type
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/969
4 years ago
Slavi Pantaleev
49868db3de
Upgrade Synapse for ARM64 (1.30.0 -> 1.30.1)
4 years ago
Slavi Pantaleev
94487dc6a7
Upgrade Synapse for amd64 (1.30.0 -> 1.30.1)
4 years ago
transcaffeine
dbae18fd6a
feat: push ephemeral events to appservices
...
This adds https://github.com/matrix-org/matrix-doc/pull/2409 to the
appservice registrations, enabling synapse to push EDUs to appservices.
4 years ago
Dan Arnfield
97d8527e00
Update nginx (1.19.6 -> 1.19.8)
4 years ago
Slavi Pantaleev
5a4ea5f866
Make AWX enabling/disabling consistent with other playbook roles
...
That is:
- enabled in the role by default
- disabled in the compilation (playbook), if considered an optional
component
4 years ago
Aaron Raimist
bab8b950ca
Add mjolnir
4 years ago
Slavi Pantaleev
06c74728eb
Move matrix_nginx_proxy_proxy_synapse_federation_api_enabled definition to the role
...
This variable was previously undefined in the role and was only getting
defined via `group_vars/matrix_servers`.
We now properly initialize it (and its good default value) in the role
itself.
4 years ago
Slavi Pantaleev
d09609daa8
Fix Jinja2 syntax error
...
Fixes a regression introduced in ffe649a240
4 years ago
Slavi Pantaleev
6a3433fbad
Update Synapse for ARM64 (1.29.0 -> 1.30.0)
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/958
4 years ago
Slavi Pantaleev
ffe649a240
Update homeserver.yaml to keep up with Synapse v1.30.0
...
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/958
4 years ago
rakshazi
74106f2a80
Updated synapse 1.29.0 -> 1.30.0
4 years ago
Thom Wiggers
54fe59f05c
Update IRC appservice
4 years ago
Slavi Pantaleev
2737ebc290
Complain if people try to use matrix-sygnal on non-amd64
4 years ago
Slavi Pantaleev
b824522b33
Remove unnecessary with_items statement
4 years ago
Slavi Pantaleev
9a0222fa47
Add Sygnal support
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/683
4 years ago
Michael
af240aef37
remove sections from task list that arent needed
4 years ago
Michael
85127bacba
Merge remote-tracking branch 'upstream/master'
4 years ago
Michael
1e54b1d1a5
merge upstream
4 years ago
Slavi Pantaleev
f99dcd611f
Pass proper UID/GID to Synapse
...
Fixes a regression caused by a5ee39266c
.
If the user id and group id were different than 991:991
(which used to be a hardcoded default for us long ago),
there was a mismatch between what Synapse was trying to use (991:991)
and what it was actually started with (in `--user=..`). It was then
trying to change ownership, which was failing.
This was mostly affecting newer installations which were not using the
991:991 defaults we had long ago (since a1c5a197a9
).
4 years ago
Slavi Pantaleev
a5ee39266c
Go through start.py when launching Synapse
...
This allows us to benefit from helpful things it does for us,
like enabling jemalloc: https://github.com/matrix-org/synapse/pull/8553
We weren't going through `start.py` before, because it was causing some
conflict with our `docker run --user=...` stuff, but it doesn't seem
to be a problem anymore.
Having done this, we won't need to do things like
https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/941
anymore.
4 years ago
Aaron Raimist
32b3650c12
Set X-Forwarded-Proto on federation requests
4 years ago
Béla Becker
2d7e7680e5
matrix.{{ matrix_domain }} -> {{ matrix_server_fqn_matrix }}
4 years ago
Aaron Raimist
466827139a
Also check if matrix_ssl_lets_encrypt_support_email is blank
4 years ago
Slavi Pantaleev
97c0bf1a73
Merge pull request #942 from pushytoxin/etherpad1_8_12
...
Upgrade Etherpad (1.8.7 -> 1.8.12)
4 years ago
Béla Becker
60aa40845f
Upgrade Etherpad (1.8.7 -> 1.8.12)
4 years ago
Yannick Goossens
27416607d9
Another field with 'invalid input syntax for type smallint'
4 years ago
Michael
5a6bdb0c3d
merge upstream
4 years ago
Michael
571b70a1f4
fix for running outside of AWX
4 years ago
Michael
5a1f3b7d67
GMH v0.3.0
4 years ago
Michael
33ec5710d9
0.2.1 revision
4 years ago
Michael
4c882c513b
initial PR
4 years ago
Marcus Proest
2ca8211184
Merge remote-tracking branch 'upstream/master'
4 years ago
Marcus Proest
b99372a3c5
initial commit of mautrix-instagram role
4 years ago
Slavi Pantaleev
108aed53be
Fix invalid matrix-postgres.service when matrix_postgres_process_extra_arguments is empty
...
This only seems to be affecting some people badly enough to cause
matrix-postgres not to start. Certain systemd versions probably handle
it better or something.
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/889
(hopefully)
4 years ago
Slavi Pantaleev
1dbdfeec07
Fix matrix-postgres stopping for consistency with other services
...
This probably got lost somehow in all the work that happened in
https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/456
4 years ago
Slavi Pantaleev
9f91eaa54b
Fix incorrect service name
...
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/887
4 years ago
Slavi Pantaleev
91c987ca7d
Merge pull request #872 from xangelix/add-mx-puppet-groupme-gh
...
Add mx-puppet-groupme support
4 years ago
Slavi Pantaleev
d94d0e2ca5
Merge pull request #456 from eMPee584/synapse-workers
...
Synapse workers
4 years ago
Slavi Pantaleev
9dc87bb948
Add Synapse worker presets for easier configuration
...
Adding more presets in the future would be nice.
4 years ago
Slavi Pantaleev
eaea215282
Allow Synapse workers to be used with an external nginx webserver
...
We're talking about a webserver running on the same machine, which
imports the configuration files generated by the `matrix-nginx-proxy`
in the `/matrix/nginx-proxy/conf.d` directory.
Users who run an nginx webserver on some other machine will need to do
something different.
4 years ago
Slavi Pantaleev
2f732e4234
Update Synapse worker endpoints
4 years ago
Slavi Pantaleev
217b4a8808
Release Synapse v1.27.0 to ARM32 via self-building
...
Related to: https://matrix.org/blog/2021/02/18/synapse-1-27-0-released#dropping-armv7-docker-images
4 years ago
Béla Becker
65eab14a64
Make sure Etherpad has a database to write to
4 years ago
Béla Becker
005f4d57f9
Remove mention of sqlite3 support for Etherpad
...
The official Etherpad Docker image has no support for sqlite3 databases.
4 years ago
Slavi Pantaleev
1789620901
Merge branch 'master' into synapse-workers
4 years ago
Slavi Pantaleev
d6c4d41c2b
Define instanceId property on workers
...
This give us the possibility to run multiple instances of
workers that that don't expose a port.
Right now, we don't support that, but in the future we could
run multiple `federation_sender` or `pusher` workers, without
them fighting over naming (previously, they'd all be named
something like `matrix-synapse-worker-pusher-0`, because
they'd all define `port` as `0`).
4 years ago
rakshazi
996f732f98
Update synapse-admin (0.6.1 -> 0.7.0)
4 years ago
Cody Neiman
c4e1209452
Merge branch 'master' into add-mx-puppet-groupme-gh
4 years ago
Slavi Pantaleev
d33483b8ce
Document that Synapse pusher worker instances are shardable
...
Related to:
- https://github.com/matrix-org/synapse/pull/9407
- https://github.com/matrix-org/synapse/pull/7855
4 years ago
Slavi Pantaleev
daae74b074
Merge branch 'master' into synapse-workers
4 years ago
Slavi Pantaleev
521160c12f
Upgrade Synapse (v1.26.0 -> v1.27.0)
4 years ago
Slavi Pantaleev
865d71e35a
Upgrade Element (1.7.20 -> 1.7.21)
4 years ago
Marc Leuser
fd3d48bb6d
trust the reverse proxy by default
4 years ago
Marc Leuser
1434c371bd
safer port binding of etherpad docker container
...
don't bind to any host port if nginx_proxy is used
only bind to localhost if it's not used
4 years ago
Slavi Pantaleev
61e427d690
Do not let people enable more than 1 federation_sender worker
4 years ago
Slavi Pantaleev
85a05f38e8
Allow Synapse worker list to be generated dynamically
...
This leads to much easier management and potential safety
features (validation). In the future, we could try to avoid port
conflicts as well, but it didn't seem worth the effort to do it now.
Our port ranges seem large enough.
This can also pave the way for a "presets" feature
(similar to `matrix_nginx_proxy_ssl_presets`) which makes it even easier
for people to configure worker counts.
4 years ago
Slavi Pantaleev
43059bb040
Fix metrics listeners for Synapse workers
...
`::` leads to errors like:
> socket.gaierror: [Errno -9] Address family for hostname not supported
4 years ago
Slavi Pantaleev
453a4ec2d8
Relocate tasks related to Synapse workers
4 years ago
Cody Neiman
e510481e84
Merge branch 'master' into add-mx-puppet-groupme-gh
4 years ago