ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wrong elasticsearch host while using it externally

pull/803/head
cruizba 2023-04-04 20:54:34 +02:00
parent 5298a085cb
commit 0c6f798692
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openvidu-server/deployments/enterprise/docker-compose/docker-compose.yml
View File

@ -128,7 +128,7 @@ services:
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
- /:/hostfs:ro - /:/hostfs:ro
entrypoint: > entrypoint: >
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]} ES_PORT=$${BASH_REMATCH[4]}
@ -141,8 +141,8 @@ services:
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
exit 1 exit 1
fi) fi;
/bin/bash -c "$$@"' exec /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs /bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
`if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi` `if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi`
@ -165,7 +165,7 @@ services:
- /var/lib/docker:/var/lib/docker:ro - /var/lib/docker:/var/lib/docker:ro
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
entrypoint: > entrypoint: >
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]} ES_PORT=$${BASH_REMATCH[4]}
@ -178,8 +178,8 @@ services:
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
exit 1 exit 1
fi) fi;
/bin/bash -c "$$@"' exec /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "filebeat -e -strict.perms=false /bin/bash -c "filebeat -e -strict.perms=false
`if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi` `if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi`

12
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
View File

@ -161,7 +161,7 @@ services:
- /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro - /sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro
- /:/hostfs:ro - /:/hostfs:ro
entrypoint: > entrypoint: >
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]} ES_PORT=$${BASH_REMATCH[4]}
@ -174,8 +174,8 @@ services:
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
exit 1 exit 1
fi) fi;
/bin/bash -c "$$@"' exec /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs /bin/bash -c "metricbeat -e -strict.perms=false -e -system.hostfs=/hostfs
`if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi` `if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi`
@ -198,7 +198,7 @@ services:
- /var/lib/docker:/var/lib/docker:ro - /var/lib/docker:/var/lib/docker:ro
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
entrypoint: > entrypoint: >
/bin/bash -c '$$(if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then /bin/bash -c 'if [[ $${OPENVIDU_PRO_ELASTICSEARCH_HOST} =~ ^(https?://)?([^:/]+)(:([0-9]+))?(/.*)?$$ ]]; then
ES_PROTO=$${BASH_REMATCH[1]} ES_PROTO=$${BASH_REMATCH[1]}
ES_HOST=$${BASH_REMATCH[2]} ES_HOST=$${BASH_REMATCH[2]}
ES_PORT=$${BASH_REMATCH[4]} ES_PORT=$${BASH_REMATCH[4]}
@ -211,8 +211,8 @@ services:
export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH} export OPENVIDU_PRO_ELASTICSEARCH_HOST=$${ES_PROTO}$${ES_HOST}:$${ES_PORT}$${ES_PATH}
else else
exit 1 exit 1
fi) fi;
/bin/bash -c "$$@"' exec /bin/bash -c "$$@"'
command: > command: >
/bin/bash -c "filebeat -e -strict.perms=false /bin/bash -c "filebeat -e -strict.perms=false
`if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi` `if [ ! -z $ELASTICSEARCH_USERNAME ]; then echo '-E output.elasticsearch.username=$ELASTICSEARCH_USERNAME'; fi`