Compare commits

..

25 Commits

Author SHA1 Message Date
a3b2ee542a
feat: add automatic creation of reverse-proxy routing 2021-09-01 08:23:24 +02:00
56bfe833d2
meta: move inventory structure to be more usable 2021-09-01 08:23:23 +02:00
9e9dcecf06
meta: add own inventory, add vault-unlock with GPG 2021-09-01 08:23:22 +02:00
Slavi Pantaleev
1c9124e3b7
Merge pull request #1260 from aaronraimist/self-build
Pull correct version when self building Mautrix Facebook and Synapse Admin
2021-08-31 17:30:49 +03:00
Aaron Raimist
3ab01a5f9e
Pull correct version when self building Mautrix Facebook and Synapse Admin 2021-08-31 08:43:52 -05:00
Slavi Pantaleev
578645fd77
Merge pull request #1259 from FSG-Cat/patch-2
Upgrade to Synaspe v 1.41.1 (Security Update)
2021-08-31 16:28:25 +03:00
Catalan Lover
777ba6bc5a
Upgrade to Synaspe v 1.41.1 (Security Update)
Synapse 1.41.1 Patches 2 exploits that can reveal information about rooms an user is not supposed to have access to information about.
2021-08-31 14:54:23 +02:00
Slavi Pantaleev
02f4e8cf0d Remove no-longer accurate sentences 2021-08-31 10:07:58 +03:00
Slavi Pantaleev
7fc1a94c30
Merge pull request #1258 from sakkiii/jitsi-fix
Jitsi Update (stable-5963 -> stable-6173)
2021-08-30 10:41:00 +03:00
Slavi Pantaleev
9d06dd61a6 Upgrade exim-relay (4.94.2-r0-3 -> 4.94.2-r0-4) 2021-08-30 10:09:51 +03:00
Slavi Pantaleev
40a72b2567
Merge pull request #1257 from derhagen/patch-1
Add link to Dimension admin page
2021-08-30 09:26:59 +03:00
Hagen
a62eb05d5b
Add link to Dimension admin page
This avoids having to create a new room and to click the "Add widgets, bridges & bots" link (Formerly the four-squares-icon)
2021-08-29 19:21:14 +02:00
sakkiii
d3e2574d40 Update configuring-playbook-jitsi.md
matrix_jitsi_jicofo_component_secret var removed #1139
2021-08-29 21:48:33 +05:30
sakkiii
510f299c04 Syntex fixed 2021-08-29 21:43:39 +05:30
sakkiii
465d436b1b
Merge branch 'spantaleev:master' into jitsi-fix 2021-08-29 19:35:09 +05:30
sakkiii
a43b109653 Jitsi Update stable-5963 2021-08-29 19:34:30 +05:30
Slavi Pantaleev
4f51da9fce
Merge pull request #1256 from sakkiii/patch-3
Update Coturn (4.5.2-r3 -> 4.5.2-r4)
2021-08-29 16:34:03 +03:00
sakkiii
6feb99076a
Update Coturn (4.5.2-r3 -> 4.5.2-r4) 2021-08-29 15:40:00 +05:30
Slavi Pantaleev
12a172f07d
Merge pull request #1254 from wol-win/update/prometheus
Update prometheus (2.29.1 -> 2.29.2)
2021-08-27 20:43:36 +03:00
WobbelTheBear
972077aa33
Update prometheus (2.29.1 -> 2.29.2)
Update prometheus (2.29.1 -> 2.29.2)
2021-08-27 16:51:38 +02:00
Slavi Pantaleev
ad3d2a5aee
Merge pull request #1252 from sakkiii/patch-4
mjolnir & hydrogen Minor Updates
2021-08-25 20:23:57 +03:00
Slavi Pantaleev
41eb06c5d0
Merge pull request #1251 from sakkiii/patch-3
Grafana Update 8.0.6 -> 8.1.2
2021-08-25 20:23:22 +03:00
sakkiii
e4ea32b89f
Hydrogen v0.2.7 2021-08-25 22:49:12 +05:30
sakkiii
44709465c9
mjolnir releases v0.1.19 2021-08-25 22:45:21 +05:30
sakkiii
86f5ba8348
Grafana Grafana v8.1 2021-08-25 22:43:07 +05:30
14 changed files with 27 additions and 14 deletions

View File

@ -24,7 +24,7 @@ matrix_dimension_enabled: true
## Define admin users
These users can modify the integrations this Dimension supports. Admin interface is accessible by opening Dimension in Element and clicking the settings icon.
These users can modify the integrations this Dimension supports. Admin interface is accessible at `https://dimension.<your-domain>/riot-app/admin` after logging in to element.
Add this to your configuration file (`inventory/host_vars/matrix.<your-domain>/vars.yml`):
```yaml

View File

@ -26,7 +26,6 @@ matrix_jitsi_enabled: true
# Run `bash inventory/scripts/jitsi-generate-passwords.sh` to generate these passwords,
# or define your own strong passwords manually.
matrix_jitsi_jicofo_component_secret: ""
matrix_jitsi_jicofo_auth_password: ""
matrix_jitsi_jvb_auth_password: ""
matrix_jitsi_jibri_recorder_password: ""

View File

@ -27,8 +27,6 @@ ansible-playbook -i inventory/hosts setup.yml \
--tags=import-postgres
```
We specify the `synapse` database as the default import database. If your dump is a single-database dump (`pg_dump`), then we need to tell it where to go to. If you're redefining `matrix_synapse_database_database` to something other than `synapse`, please adjust it here too. For database dumps spanning multiple databases (`pg_dumpall`), you can remove the `postgres_default_import_database` definition (but it doesn't hurt to keep it too).
**Note**: `<server-path-to-postgres-dump.sql>` must be a file path to a Postgres dump file on the server (not on your local machine!).

View File

@ -3,7 +3,7 @@
matrix_bot_mjolnir_enabled: true
matrix_bot_mjolnir_version: "v0.1.18"
matrix_bot_mjolnir_version: "v0.1.19"
matrix_bot_mjolnir_container_image_self_build: false
matrix_bot_mjolnir_container_image_self_build_repo: "https://github.com/matrix-org/mjolnir.git"

View File

@ -60,7 +60,7 @@
git:
repo: "{{ matrix_mautrix_facebook_container_image_self_build_repo }}"
dest: "{{ matrix_mautrix_facebook_docker_src_files_path }}"
# version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
version: "{{ matrix_mautrix_facebook_docker_image.split(':')[1] }}"
force: "yes"
register: matrix_mautrix_facebook_git_pull_results
when: "matrix_mautrix_facebook_container_image_self_build|bool"

View File

@ -5,7 +5,7 @@ matrix_client_hydrogen_enabled: true
matrix_client_hydrogen_container_image_self_build: true
matrix_client_hydrogen_container_image_self_build_repo: "https://github.com/vector-im/hydrogen-web.git"
matrix_client_hydrogen_version: v0.2.5
matrix_client_hydrogen_version: v0.2.7
matrix_client_hydrogen_docker_image: "{{ matrix_client_hydrogen_docker_image_name_prefix }}vectorim/hydrogen-web:{{ matrix_client_hydrogen_version }}"
matrix_client_hydrogen_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_hydrogen_container_image_self_build }}"
matrix_client_hydrogen_docker_image_force_pull: "{{ matrix_client_hydrogen_docker_image.endswith(':latest') }}"

View File

@ -5,7 +5,7 @@ matrix_coturn_container_image_self_build_repo: "https://github.com/coturn/coturn
matrix_coturn_container_image_self_build_repo_version: "docker/{{ matrix_coturn_version }}"
matrix_coturn_container_image_self_build_repo_dockerfile_path: "docker/coturn/alpine/Dockerfile"
matrix_coturn_version: 4.5.2-r3
matrix_coturn_version: 4.5.2-r4
matrix_coturn_docker_image: "{{ matrix_coturn_docker_image_name_prefix }}coturn/coturn:{{ matrix_coturn_version }}-alpine"
matrix_coturn_docker_image_name_prefix: "{{ 'localhost/' if matrix_coturn_container_image_self_build else matrix_container_global_registry_prefix }}"
matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"

View File

@ -3,7 +3,7 @@
matrix_grafana_enabled: false
matrix_grafana_version: 8.0.6
matrix_grafana_version: 8.1.2
matrix_grafana_docker_image: "{{ matrix_container_global_registry_prefix }}grafana/grafana:{{ matrix_grafana_version }}"
matrix_grafana_docker_image_force_pull: "{{ matrix_grafana_docker_image.endswith(':latest') }}"

View File

@ -7,6 +7,7 @@ matrix_jitsi_enable_guests: false
matrix_jitsi_enable_recording: false
matrix_jitsi_enable_transcriptions: false
matrix_jitsi_enable_p2p: true
matrix_jitsi_enable_av_moderation: true
# Authentication type, must be one of internal, jwt or ldap. Currently only
# internal and ldap are supported by this playbook.
@ -53,7 +54,7 @@ matrix_jitsi_jibri_recorder_password: ''
matrix_jitsi_enable_lobby: false
matrix_jitsi_version: stable-5963
matrix_jitsi_version: stable-6173
matrix_jitsi_container_image_tag: "{{ matrix_jitsi_version }}" # for backward-compatibility
matrix_jitsi_web_docker_image: "{{ matrix_container_global_registry_prefix }}jitsi/web:{{ matrix_jitsi_container_image_tag }}"
@ -69,6 +70,14 @@ matrix_jitsi_web_public_url: "https://{{ matrix_server_fqn_jitsi }}"
# Addresses need to be prefixed with one of `stun:`, `turn:` or `turns:`.
matrix_jitsi_web_stun_servers: ['stun:meet-jit-si-turnrelay.jitsi.net:443']
# Setting up TURN
# Default set with Coturn container
matrix_jitsi_turn_credentials: "{{ matrix_coturn_turn_static_auth_secret }}"
matrix_jitsi_turn_host: "turn.{{ matrix_server_fqn_matrix }}"
matrix_jitsi_turns_host: "turn.{{ matrix_server_fqn_matrix }}"
matrix_jitsi_turn_port: "{{ matrix_coturn_container_stun_plain_host_bind_port }}"
matrix_jitsi_turns_port: "{{ matrix_coturn_container_stun_tls_host_bind_port }}"
# Controls whether Etherpad will be available within Jitsi
matrix_jitsi_etherpad_enabled: false

View File

@ -2,6 +2,7 @@ AUTH_TYPE={{ matrix_jitsi_auth_type }}
ENABLE_AUTH={{ 1 if matrix_jitsi_enable_auth else 0 }}
ENABLE_GUESTS={{ 1 if matrix_jitsi_enable_guests else 0 }}
ENABLE_LOBBY={{ 1 if matrix_jitsi_enable_lobby else 0 }}
ENABLE_AV_MODERATION={{1 if matrix_jitsi_enable_av_moderation else 0}}
ENABLE_XMPP_WEBSOCKET
GLOBAL_MODULES
GLOBAL_CONFIG
@ -48,4 +49,9 @@ JWT_AUTH_TYPE
JWT_TOKEN_AUTH_MODULE
LOG_LEVEL
PUBLIC_URL={{ matrix_jitsi_web_public_url }}
TURN_CREDENTIALS={{ matrix_jitsi_turn_credentials }}
TURN_HOST={{ matrix_jitsi_turn_host }}
TURNS_HOST={{ matrix_jitsi_turns_host }}
TURN_PORT={{ matrix_jitsi_turn_port }}
TURNS_PORT={{ matrix_jitsi_turns_port }}
TZ={{ matrix_jitsi_timezone }}

View File

@ -7,7 +7,7 @@ matrix_mailer_container_image_self_build_repository_url: "https://github.com/dev
matrix_mailer_container_image_self_build_src_files_path: "{{ matrix_mailer_base_path }}/docker-src"
matrix_mailer_container_image_self_build_version: "{{ matrix_mailer_docker_image.split(':')[1] }}"
matrix_mailer_version: 4.94.2-r0-3
matrix_mailer_version: 4.94.2-r0-4
matrix_mailer_docker_image: "{{ matrix_mailer_docker_image_name_prefix }}devture/exim-relay:{{ matrix_mailer_version }}"
matrix_mailer_docker_image_name_prefix: "{{ 'localhost/' if matrix_mailer_container_image_self_build else matrix_container_global_registry_prefix }}"
matrix_mailer_docker_image_force_pull: "{{ matrix_mailer_docker_image.endswith(':latest') }}"

View File

@ -3,7 +3,7 @@
matrix_prometheus_enabled: false
matrix_prometheus_version: v2.29.1
matrix_prometheus_version: v2.29.2
matrix_prometheus_docker_image: "{{ matrix_container_global_registry_prefix }}prom/prometheus:{{ matrix_prometheus_version }}"
matrix_prometheus_docker_image_force_pull: "{{ matrix_prometheus_docker_image.endswith(':latest') }}"

View File

@ -16,6 +16,7 @@
git:
repo: "{{ matrix_synapse_admin_container_self_build_repo }}"
dest: "{{ matrix_synapse_admin_docker_src_files_path }}"
version: "{{ matrix_synapse_admin_docker_image.split(':')[1] }}"
force: "yes"
register: matrix_synapse_admin_git_pull_results
when: "matrix_synapse_admin_enabled|bool and matrix_synapse_admin_container_self_build|bool"

View File

@ -15,8 +15,8 @@ matrix_synapse_docker_image_name_prefix: "{{ 'localhost/' if matrix_synapse_cont
# amd64 gets released first.
# arm32 relies on self-building, so the same version can be built immediately.
# arm64 users need to wait for a prebuilt image to become available.
matrix_synapse_version: v1.41.0
matrix_synapse_version_arm64: v1.41.0
matrix_synapse_version: v1.41.1
matrix_synapse_version_arm64: v1.41.1
matrix_synapse_docker_image_tag: "{{ matrix_synapse_version if matrix_architecture in ['arm32', 'amd64'] else matrix_synapse_version_arm64 }}"
matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"