Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

web: allow to configure shard name using env variable

Browse Source
This commit is contained in:
Prayag Singh
2021-04-15 15:08:56 +05:30
committed by GitHub
parent a6853ef5f7
commit 78699fe65a
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -34,6 +34,8 @@ services:
- CONFIG_EXTERNAL_CONNECT - CONFIG_EXTERNAL_CONNECT
- DEPLOYMENTINFO_ENVIRONMENT - DEPLOYMENTINFO_ENVIRONMENT
- DEPLOYMENTINFO_ENVIRONMENT_TYPE - DEPLOYMENTINFO_ENVIRONMENT_TYPE
- DEPLOYMENTINFO_REGION
- DEPLOYMENTINFO_SHARD
- DEPLOYMENTINFO_USERREGION - DEPLOYMENTINFO_USERREGION
- DIALIN_NUMBERS_URL - DIALIN_NUMBERS_URL
- DIALOUT_AUTH_URL - DIALOUT_AUTH_URL

4
web/rootfs/defaults/meet.conf
View File

@@ -18,6 +18,10 @@ error_page 404 /static/404.html;
add_header X-Content-Type-Options nosniff; add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block"; add_header X-XSS-Protection "1; mode=block";
{{ if .Env.DEPLOYMENTINFO_SHARD }}
add_header X-Jitsi-Shard {{ .Env.DEPLOYMENTINFO_SHARD }};
{{ end }}
location = /config.js { location = /config.js {
alias /config/config.js; alias /config/config.js;
} }

8
web/rootfs/defaults/settings-config.js
View File

@@ -284,10 +284,18 @@ if (!config.hasOwnProperty('deploymentInfo')) config.deploymentInfo = {};
config.deploymentInfo.environment = '{{ .Env.DEPLOYMENTINFO_ENVIRONMENT }}'; config.deploymentInfo.environment = '{{ .Env.DEPLOYMENTINFO_ENVIRONMENT }}';
{{ end -}} {{ end -}}
{{ if .Env.DEPLOYMENTINFO_SHARD -}}
config.deploymentInfo.shard = '{{ .Env.DEPLOYMENTINFO_SHARD }}';
{{ end -}}
{{ if .Env.DEPLOYMENTINFO_ENVIRONMENT_TYPE -}} {{ if .Env.DEPLOYMENTINFO_ENVIRONMENT_TYPE -}}
config.deploymentInfo.envType = '{{ .Env.DEPLOYMENTINFO_ENVIRONMENT_TYPE }}'; config.deploymentInfo.envType = '{{ .Env.DEPLOYMENTINFO_ENVIRONMENT_TYPE }}';
{{ end -}} {{ end -}}
{{ if .Env.DEPLOYMENTINFO_REGION -}}
config.deploymentInfo.region = '{{ .Env.DEPLOYMENTINFO_REGION }}';
{{ end -}}
{{ if $DEPLOYMENTINFO_USERREGION -}} {{ if $DEPLOYMENTINFO_USERREGION -}}
config.deploymentInfo.userRegion = '{{ $DEPLOYMENTINFO_USERREGION }}'; config.deploymentInfo.userRegion = '{{ $DEPLOYMENTINFO_USERREGION }}';
{{ end -}} {{ end -}}