opendev/system-config
Code Issues Proposed changes

Allow overriding of meetpad PUBLIC_URL

Browse Source 
In testing jammy updates we discovered that this value need to match
so that websockets are directed to the correct host.

Change-Id: Id44bf92edff411389f05a652dad2ae78607e4d55
This commit is contained in:
Tony Breeds 2024-01-13 08:55:20 +11:00
parent f6a131ebc0
commit ba511c4d1c
6 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory/service/group_vars/jvb.yaml
View File

@ -1,5 +1,5 @@
meetpad_jvb_xmpp_server: "{{ hostvars['meetpad01.opendev.org'].ansible_host }}"
iptables_extra_public_udp_ports: iptables_extra_public_udp_ports:
- 10000 - 10000
iptables_extra_allowed_groups: iptables_extra_allowed_groups:
- {'protocol': 'tcp', 'port': '9090', 'group': 'meetpad'} - {'protocol': 'tcp', 'port': '9090', 'group': 'meetpad'}
meetpad_jvb_xmpp_server: "{{ hostvars['meetpad01.opendev.org'].ansible_host }}"

1
playbooks/roles/jitsi-meet/defaults/main.yaml
View File

@ -1,2 +1,3 @@
docker_compose_file: meet-docker-compose.yaml docker_compose_file: meet-docker-compose.yaml
docker_compose_env_file: meet-env.j2 docker_compose_env_file: meet-env.j2
jitsi_meet_public_url: https://meetpad.opendev.org

2
playbooks/roles/jitsi-meet/templates/jvb-env.j2
View File

@ -5,7 +5,7 @@
# any defaults from the example): # any defaults from the example):
CONFIG=/var/jitsi-meet CONFIG=/var/jitsi-meet
DEFAULTS=/var/jitsi-meet/defaults DEFAULTS=/var/jitsi-meet/defaults
PUBLIC_URL=https://meetpad.opendev.org PUBLIC_URL={{ jitsi_meet_public_url }}
XMPP_SERVER={{ meetpad_jvb_xmpp_server }} XMPP_SERVER={{ meetpad_jvb_xmpp_server }}
XMPP_AUTH_DOMAIN=auth.localhost XMPP_AUTH_DOMAIN=auth.localhost
XMPP_INTERNAL_MUC_DOMAIN=internal-muc.localhost XMPP_INTERNAL_MUC_DOMAIN=internal-muc.localhost

2
playbooks/roles/jitsi-meet/templates/meet-env.j2
View File

@ -5,7 +5,7 @@
# any defaults from the example): # any defaults from the example):
CONFIG=/var/jitsi-meet CONFIG=/var/jitsi-meet
DEFAULTS=/var/jitsi-meet/defaults DEFAULTS=/var/jitsi-meet/defaults
PUBLIC_URL=https://meetpad.opendev.org PUBLIC_URL={{ jitsi_meet_public_url }}
ETHERPAD_URL_BASE=https://etherpad.opendev.org ETHERPAD_URL_BASE=https://etherpad.opendev.org
ENABLE_XMPP_WEBSOCKET=0 ENABLE_XMPP_WEBSOCKET=0
XMPP_DOMAIN=localhost XMPP_DOMAIN=localhost

1
playbooks/zuul/templates/group_vars/jvb.yaml.j2
View File

@ -1,2 +1,3 @@
jitsi_meet_public_url: https://meetpad01.opendev.org
meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0 meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0
meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG

1
playbooks/zuul/templates/group_vars/meetpad.yaml.j2
View File

@ -1,3 +1,4 @@
jitsi_meet_public_url: https://meetpad01.opendev.org
meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0 meetpad_jvb_auth_password: 8c64807830bcc7581821d3157899e3b0
meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG meetpad_jvb_keystore_password: ateeweegoLee3aig5eish8aeraetiG
meetpad_jicofo_component_secret: 3bcd6b4494d99de7ff7b64b931d394f6 meetpad_jicofo_component_secret: 3bcd6b4494d99de7ff7b64b931d394f6