aboutsummaryrefslogtreecommitdiff
path: root/cluster
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2023-02-02 15:37:43 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2023-02-02 15:37:43 +0100
commit67bcd07056cdde3bf900754a47f73ae6ee9239e6 (patch)
treed3b67bc43e32a8efeaf1212d2a2fb88989e2093a /cluster
parenta3ca27055d76904be5aa0a0cf3d8ba276c72d78c (diff)
downloadnixcfg-67bcd07056cdde3bf900754a47f73ae6ee9239e6.tar.gz
nixcfg-67bcd07056cdde3bf900754a47f73ae6ee9239e6.zip
upgrade prod tentative 1
Diffstat (limited to 'cluster')
-rw-r--r--cluster/prod/app/jitsi/config/nginx.conf5
-rw-r--r--cluster/prod/app/jitsi/config/prosody.cfg.lua2
-rw-r--r--cluster/prod/app/jitsi/deploy/jitsi.hcl8
3 files changed, 9 insertions, 6 deletions
diff --git a/cluster/prod/app/jitsi/config/nginx.conf b/cluster/prod/app/jitsi/config/nginx.conf
index 32cc3c1..c988059 100644
--- a/cluster/prod/app/jitsi/config/nginx.conf
+++ b/cluster/prod/app/jitsi/config/nginx.conf
@@ -91,8 +91,9 @@ http {
add_header 'Access-Control-Allow-Methods' 'GET,POST,PUT,DELETE,OPTIONS';
add_header 'Access-Control-Allow-Origin' '*';
proxy_pass http://{{ env "NOMAD_ADDR_bosh_port" }}/http-bind;
- proxy_set_header X-Forwarded-For \$remote_addr;
- #proxy_set_header Host \$http_host;
+ proxy_set_header X-Forwarded-For $remote_addr;
+ #proxy_set_header Host $http_host;
+ proxy_set_header Host jitsi-bosh;
}
# not used yet VVV
diff --git a/cluster/prod/app/jitsi/config/prosody.cfg.lua b/cluster/prod/app/jitsi/config/prosody.cfg.lua
index 7141f8b..ff06a68 100644
--- a/cluster/prod/app/jitsi/config/prosody.cfg.lua
+++ b/cluster/prod/app/jitsi/config/prosody.cfg.lua
@@ -49,6 +49,7 @@ consider_bosh_secure = true;
component_ports = { } -- it seems we don't need external components for now...
https_ports = { } -- we don't need https
http_ports = { {{env "NOMAD_PORT_bosh_port" }} }
+http_interfaces = { "0.0.0.0", "::" }
c2s_ports = { {{env "NOMAD_PORT_xmpp_port" }} }
@@ -89,6 +90,7 @@ VirtualHost "jitsi"
lobby_muc = "lobby.jitsi"
main_muc = "conference.jitsi"
-- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
+ http_host = "jitsi-bosh"
Component "conference.jitsi" "muc"
storage = "memory"
diff --git a/cluster/prod/app/jitsi/deploy/jitsi.hcl b/cluster/prod/app/jitsi/deploy/jitsi.hcl
index d820180..523a88d 100644
--- a/cluster/prod/app/jitsi/deploy/jitsi.hcl
+++ b/cluster/prod/app/jitsi/deploy/jitsi.hcl
@@ -20,7 +20,7 @@ job "jitsi" {
task "xmpp" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_xmpp:v10"
+ image = "superboum/amd64_jitsi_xmpp:v11"
ports = [ "bosh_port", "xmpp_port" ]
network_mode = "host"
volumes = [
@@ -101,7 +101,7 @@ EOF
task "front" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_meet:v5"
+ image = "superboum/amd64_jitsi_meet:v6"
network_mode = "host"
ports = [ "https_port" ]
volumes = [
@@ -163,7 +163,7 @@ EOF
task "jicofo" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_conference_focus:v9"
+ image = "superboum/amd64_jitsi_conference_focus:v10"
network_mode = "host"
volumes = [
"secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt",
@@ -203,7 +203,7 @@ EOF
task "videobridge" {
driver = "docker"
config {
- image = "superboum/amd64_jitsi_videobridge:v20"
+ image = "superboum/amd64_jitsi_videobridge:v21"
network_mode = "host"
ports = [ "video_port" ]
ulimit {