tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

upgrade prod tentative 1

Browse source
This commit is contained in:
Quentin 2023-02-02 15:37:43 +01:00
parent a3ca27055d
commit 67bcd07056
Signed by untrusted user: quentin
GPG key ID: E9602264D639FF68
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cluster/prod/app/jitsi/config/nginx.conf
View file

@ -91,8 +91,9 @@ http {
add_header 'Access-Control-Allow-Methods' 'GET,POST,PUT,DELETE,OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET,POST,PUT,DELETE,OPTIONS';
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
proxy_pass http://{{ env "NOMAD_ADDR_bosh_port" }}/http-bind; proxy_pass http://{{ env "NOMAD_ADDR_bosh_port" }}/http-bind;
proxy_set_header X-Forwarded-For \$remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
#proxy_set_header Host \$http_host; #proxy_set_header Host $http_host;
proxy_set_header Host jitsi-bosh;
} }
# not used yet VVV # not used yet VVV

2
cluster/prod/app/jitsi/config/prosody.cfg.lua
View file

@ -49,6 +49,7 @@ consider_bosh_secure = true;
component_ports = { } -- it seems we don't need external components for now... component_ports = { } -- it seems we don't need external components for now...
https_ports = { } -- we don't need https https_ports = { } -- we don't need https
http_ports = { {{env "NOMAD_PORT_bosh_port" }} } http_ports = { {{env "NOMAD_PORT_bosh_port" }} }
http_interfaces = { "0.0.0.0", "::" }
c2s_ports = { {{env "NOMAD_PORT_xmpp_port" }} } c2s_ports = { {{env "NOMAD_PORT_xmpp_port" }} }
@ -89,6 +90,7 @@ VirtualHost "jitsi"
lobby_muc = "lobby.jitsi" lobby_muc = "lobby.jitsi"
main_muc = "conference.jitsi" main_muc = "conference.jitsi"
-- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms -- 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" Component "conference.jitsi" "muc"
storage = "memory" storage = "memory"

8
cluster/prod/app/jitsi/deploy/jitsi.hcl
View file

@ -20,7 +20,7 @@ job "jitsi" {
task "xmpp" { task "xmpp" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_xmpp:v10" image = "superboum/amd64_jitsi_xmpp:v11"
ports = [ "bosh_port", "xmpp_port" ] ports = [ "bosh_port", "xmpp_port" ]
network_mode = "host" network_mode = "host"
volumes = [ volumes = [
@ -101,7 +101,7 @@ EOF
task "front" { task "front" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_meet:v5" image = "superboum/amd64_jitsi_meet:v6"
network_mode = "host" network_mode = "host"
ports = [ "https_port" ] ports = [ "https_port" ]
volumes = [ volumes = [
@ -163,7 +163,7 @@ EOF
task "jicofo" { task "jicofo" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_conference_focus:v9" image = "superboum/amd64_jitsi_conference_focus:v10"
network_mode = "host" network_mode = "host"
volumes = [ volumes = [
"secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt", "secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt",
@ -203,7 +203,7 @@ EOF
task "videobridge" { task "videobridge" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_jitsi_videobridge:v20" image = "superboum/amd64_jitsi_videobridge:v21"
network_mode = "host" network_mode = "host"
ports = [ "video_port" ] ports = [ "video_port" ]
ulimit { ulimit {