Skip to content

Commit 78699fe

Browse files
authored
web: allow to configure shard name using env variable
1 parent a6853ef commit 78699fe

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ services:
3434
- CONFIG_EXTERNAL_CONNECT
3535
- DEPLOYMENTINFO_ENVIRONMENT
3636
- DEPLOYMENTINFO_ENVIRONMENT_TYPE
37+
- DEPLOYMENTINFO_REGION
38+
- DEPLOYMENTINFO_SHARD
3739
- DEPLOYMENTINFO_USERREGION
3840
- DIALIN_NUMBERS_URL
3941
- DIALOUT_AUTH_URL

web/rootfs/defaults/meet.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ error_page 404 /static/404.html;
1818
add_header X-Content-Type-Options nosniff;
1919
add_header X-XSS-Protection "1; mode=block";
2020

21+
{{ if .Env.DEPLOYMENTINFO_SHARD }}
22+
add_header X-Jitsi-Shard {{ .Env.DEPLOYMENTINFO_SHARD }};
23+
{{ end }}
24+
2125
location = /config.js {
2226
alias /config/config.js;
2327
}

web/rootfs/defaults/settings-config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,18 @@ if (!config.hasOwnProperty('deploymentInfo')) config.deploymentInfo = {};
284284
config.deploymentInfo.environment = '{{ .Env.DEPLOYMENTINFO_ENVIRONMENT }}';
285285
{{ end -}}
286286

287+
{{ if .Env.DEPLOYMENTINFO_SHARD -}}
288+
config.deploymentInfo.shard = '{{ .Env.DEPLOYMENTINFO_SHARD }}';
289+
{{ end -}}
290+
287291
{{ if .Env.DEPLOYMENTINFO_ENVIRONMENT_TYPE -}}
288292
config.deploymentInfo.envType = '{{ .Env.DEPLOYMENTINFO_ENVIRONMENT_TYPE }}';
289293
{{ end -}}
290294

295+
{{ if .Env.DEPLOYMENTINFO_REGION -}}
296+
config.deploymentInfo.region = '{{ .Env.DEPLOYMENTINFO_REGION }}';
297+
{{ end -}}
298+
291299
{{ if $DEPLOYMENTINFO_USERREGION -}}
292300
config.deploymentInfo.userRegion = '{{ $DEPLOYMENTINFO_USERREGION }}';
293301
{{ end -}}

0 commit comments

Comments
 (0)