Commit graph

2811 commits

Author SHA1 Message Date
Michael-GMH ad7bbd6442 merge upstream 2021-06-01 16:00:13 +08:00
Michael-GMH 6f40d78353 fix random edits to upstream 2021-05-25 21:25:40 +08:00
Michael-GMH ea6e344d05 merge upstream 2021-05-25 21:10:34 +08:00
Michael-GMH 85777e8f96 merge with upstream 2021-05-25 21:08:00 +08:00
Slavi Pantaleev 1ed0857019 Fix syntax error
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1024
2021-05-25 11:45:17 +03:00
Slavi Pantaleev c8a2309b78
Merge pull request #1024 from sakkiii/master
HSTS preload + X-XSS enables
2021-05-25 11:42:39 +03:00
sakkiii 4a4a7f136e changes added to hydrogen client 2021-05-25 11:42:51 +05:30
sakkiii 25e67b51d1 Merge branch 'spantaleev:master' into master 2021-05-25 11:40:56 +05:30
sakkiii 3436f9c10a rename to matrix_nginx_proxy_hsts_preload_enabled 2021-05-25 00:56:59 +05:30
Slavi Pantaleev 0648b1b618 Upgrade Element (1.7.28 -> 1.7.29) 2021-05-24 20:38:48 +03:00
Slavi Pantaleev 8d1d85ab4a
Merge pull request #1082 from sakkiii/patch-2
OCSP Stapling SSL manually-managed
2021-05-24 16:00:46 +03:00
sakkiii dcd5e5657d
OCSP Stapling SSL manually-managed
# chain.pem file is required for 'ssl_trusted_certificate`
2021-05-24 17:59:34 +05:30
sakkiii 7cc5328ede Comments & Ref 2021-05-24 17:20:54 +05:30
sakkiii df2d91970d matrix_nginx_proxy_xss_protection 2021-05-24 17:02:47 +05:30
Slavi Pantaleev d4c7a90b5c
Merge pull request #1076 from Eagle-251/Jitsi-Prosody-OwnNginxCompatibility
Allow Jitsi XMPP websocket support for users using own webserver.
2021-05-24 11:07:05 +03:00
Slavi Pantaleev be7fb18ca9
Merge pull request #1081 from aaronraimist/patch-1
Remove synapse-admin incompatibility note
2021-05-24 09:41:10 +03:00
Aaron Raimist 794035790c
Remove synapse-admin incompatibility note 2021-05-23 16:53:14 -05:00
ewang 409cd2b9a3 Source port binding from group vars in line other components 2021-05-23 14:06:18 +02:00
Eagle-251 ef6a7e051c
Fix missing port binding. 2021-05-22 15:55:50 +02:00
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.
2021-05-22 15:53:42 +02:00
Slavi Pantaleev c3abcad151
Merge pull request #1079 from aaronraimist/hydrogen-fix
Fix hydrogen
2021-05-22 09:25:18 +03:00
Aaron Raimist 3c0452ff5a
Remove unnecessary bind for config.json, use proper nginx.conf 2021-05-21 17:22:40 -05:00
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
2021-05-21 15:26:06 +02:00
Slavi Pantaleev 4879fdd46b
Merge pull request #1075 from throwawayay/patch-1
docs: update Configuring DNS in Hydrogen setup
2021-05-21 15:09:20 +03:00
throwawayay b2d0a8a5e5
docs: update Configuring DNS in Hydrogen setup 2021-05-21 07:40:01 -04:00
Slavi Pantaleev 7a086d7dd9 Mention Hydrgeon in self-building.md
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1055
2021-05-21 14:01:01 +03:00
Slavi Pantaleev 55b92d5a13 Fix another typo 2021-05-21 13:52:33 +03:00
Slavi Pantaleev 0a662dcbcd Fix typo 2021-05-21 13:52:07 +03:00
Slavi Pantaleev c5d52d49da Announce Hydrogen support
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1055
2021-05-21 13:50:49 +03:00
Slavi Pantaleev 1ffce13b35
Merge pull request #1055 from aaronraimist/hydrogen
Add Hydrogen
2021-05-21 13:41:46 +03:00
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
2021-05-21 13:40:37 +03:00
Slavi Pantaleev d0de21ab34
Delete Hydrogen nginx configuration file when disabled 2021-05-21 12:58:32 +03:00
Aaron Raimist b714222384
typo 2021-05-21 04:45:40 -05:00
Aaron Raimist ac4ede20af
Add docs 2021-05-21 04:43:04 -05:00
Aaron Raimist 1633f61018
Only install config.json when self building 2021-05-21 04:23:06 -05:00
Aaron Raimist 04548f8df2
Merge branch 'master' into hydrogen 2021-05-21 04:09:18 -05:00
Aaron Raimist 9437f78c9e
Build using custom config.json, add CSP, update to 0.1.53 2021-05-21 03:45:21 -05:00
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)
2021-05-21 11:15:05 +03:00
Slavi Pantaleev 9a8a81fdb0 Disable OCSP stapling when self-signed certificates are used
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1073
2021-05-21 08:38:20 +03:00
Slavi Pantaleev 1ab507349c Fix self-building for various components on Ansible < 2.8
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
2021-05-20 08:43:20 +03:00
Slavi Pantaleev dd7a23ede6
Merge pull request #1068 from rafaelsgirao/master
Fix typo in examples/caddy2
2021-05-19 22:27:27 +03:00
Slavi Pantaleev 15f4972dbf Remove syntax-breaking pagination line
Seems to have been added by mistake.
2021-05-19 22:25:27 +03:00
Rafael Girão 729f348864
Fix typo in examples/caddy2 2021-05-19 20:11:50 +01:00
Slavi Pantaleev 66615c43a3
Merge pull request #1065 from sakkiii/patch-1
Update grafana (7.5.6->7.5.7)
2021-05-19 22:07:59 +03:00
Slavi Pantaleev f7e854c7cc
Merge pull request #1067 from theCalcaholic/fix/set-grafana-root-url
Configure root_url in granafa.ini
2021-05-19 22:07:36 +03:00
Slavi Pantaleev d3c7be177a
Improve wording 2021-05-19 22:07:23 +03:00
Tobias K 68aa5094cf
docs/configuring-playbook-prometheus-grafana.md: Add documentation on how to override the grafana fqn 2021-05-19 19:57:35 +02:00
Tobias K 3dcbed6353
roles/matrix-grafana: Set root_url in granafa.ini 2021-05-19 19:52:58 +02:00
sakkiii 8529ca4c17
Update grafana (7.5.6->7.5.7) 2021-05-19 22:30:03 +05:30
Slavi Pantaleev 073d920a62
Merge pull request #1061 from sakkiii/ssl_enhancement
Optimize SSL session
2021-05-19 17:14:52 +03:00