Garbaye/services-garbaye
3
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

Jitsi : reactivation colibri port + activation rest API + ajustement CI pour pouvoir changer de port

Browse source
This commit is contained in:
Gitouche 2024-02-17 18:36:29 +01:00
parent 6f933105ae
commit de6a3e0fd3
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
podman-jitsi/.gitlab-ci.yml
View file

@ -10,12 +10,12 @@ jitsi:
script: script:
- cd podman-jitsi - cd podman-jitsi
- ./ci_build-images.sh - ./ci_build-images.sh
- GARBAYE_JITSI_URL=https://jitsi.garbaye.fr GARBAYE_JITSI_ENV_LISTENPORT=18085 GARBAYE_JITSI_ENV_JICOFORESTPORT=18888 ./10_install.sh - GARBAYE_JITSI_URL=https://jitsi.garbaye.fr GARBAYE_JITSI_ENV_LISTENPORT=18085 GARBAYE_JITSI_ENV_JICOFORESTPORT=18888 GARBAYE_JITSI_ENV_COLIBRIPORT=18080 ./10_install.sh
- ./20_enable.sh - ./20_enable.sh
- ./30_start.sh && sleep 10 - ./30_start.sh && sleep 10
- ./40_stop.sh - ./40_stop.sh
- ./30_start.sh && sleep 10 - ./30_start.sh && sleep 10
- GARBAYE_JITSI_URL=https://jitsi.garbaye.fr GARBAYE_JITSI_ENV_LISTENPORT=18085 GARBAYE_JITSI_ENV_JICOFORESTPORT=18888 ./50_update.sh - GARBAYE_JITSI_URL=https://jitsi.garbaye.fr GARBAYE_JITSI_ENV_LISTENPORT=18085 GARBAYE_JITSI_ENV_JICOFORESTPORT=18888 GARBAYE_JITSI_ENV_COLIBRIPORT=18080 ./50_update.sh
- ./40_stop.sh - ./40_stop.sh
- ./70_disable.sh - ./70_disable.sh
- ./80_destroy.sh - ./80_destroy.sh

3
podman-jitsi/10_install.sh
View file

@ -45,7 +45,6 @@ cp env.example .env
sed_in_place "image: jitsi/" "image: git.garbaye.fr/garbaye/jitsi-" docker-compose.yml sed_in_place "image: jitsi/" "image: git.garbaye.fr/garbaye/jitsi-" docker-compose.yml
sed_in_place "^ - '\${HTTP_PORT}:80'" " - '\${listen_if}:\${HTTP_PORT}:80'" docker-compose.yml sed_in_place "^ - '\${HTTP_PORT}:80'" " - '\${listen_if}:\${HTTP_PORT}:80'" docker-compose.yml
sed_in_place "^ - '\${HTTPS_PORT}:443'" "# - '\${HTTPS_PORT}:443'" docker-compose.yml sed_in_place "^ - '\${HTTPS_PORT}:443'" "# - '\${HTTPS_PORT}:443'" docker-compose.yml
sed_in_place "^ - '127.0.0.1:\${JVB_COLIBRI_PORT:-8080}:8080'" "# - '127.0.0.1:\${JVB_COLIBRI_PORT:-8080}:8080'" docker-compose.yml
# Patch env file # Patch env file
sed_in_place "^HTTP_PORT=8000" "HTTP_PORT=${listen_port}" .env sed_in_place "^HTTP_PORT=8000" "HTTP_PORT=${listen_port}" .env
@ -60,8 +59,10 @@ echo "XMPP_SERVER=prosody" >> .env
echo "XMPP_BOSH_URL_BASE=http://prosody:5280" >> .env echo "XMPP_BOSH_URL_BASE=http://prosody:5280" >> .env
echo "JVB_PORT=${listen_port}" >> .env echo "JVB_PORT=${listen_port}" >> .env
echo "JICOFO_REST_PORT=${jicofo_port}" >> .env echo "JICOFO_REST_PORT=${jicofo_port}" >> .env
echo "JVB_COLIBRI_PORT=${colibri_port}" >> .env
echo "DISABLE_HTTPS=1" >> .env echo "DISABLE_HTTPS=1" >> .env
echo "ENABLE_IPV6=0" >> .env echo "ENABLE_IPV6=0" >> .env
echo "COLIBRI_REST_ENABLED=1" >> .env
export listen_if export listen_if
export listen_port export listen_port

1
podman-jitsi/vars.sh
View file

@ -5,6 +5,7 @@ version='stable-9258'
listen_if="${GARBAYE_JITSI_ENV_LISTENIF:-127.0.0.1}" listen_if="${GARBAYE_JITSI_ENV_LISTENIF:-127.0.0.1}"
listen_port="${GARBAYE_JITSI_ENV_LISTENPORT:-8085}" listen_port="${GARBAYE_JITSI_ENV_LISTENPORT:-8085}"
jicofo_port="${GARBAYE_JITSI_ENV_JICOFORESTPORT:-8888}" jicofo_port="${GARBAYE_JITSI_ENV_JICOFORESTPORT:-8888}"
colibri_port="${GARBAYE_JITSI_ENV_COLIBRIPORT:-8080}"
## mandatory ENV vars ## mandatory ENV vars
envvars='GARBAYE_JITSI_URL' envvars='GARBAYE_JITSI_URL'
## internal vars : do not touch ## internal vars : do not touch