Deuxfleurs/infrastructure
Archived
24
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

Fix typos in the service file

Browse source
This commit is contained in:
Quentin 2021-02-01 10:26:26 +01:00
parent 088c9df20c
commit 9337129336
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/jitsi/config/jicofo.conf
View file

@ -243,7 +243,7 @@ jicofo {
port = {{ env "NOMAD_PORT_xmpp_port" }} port = {{ env "NOMAD_PORT_xmpp_port" }}
domain = "auth.jitsi" domain = "auth.jitsi"
username = "focus" username = "focus"
password = {{ key "secrets/jitsi/jitsi_secret_jicofo_user" }} password = {{ key "secrets/jitsi/jicofo_pass" }}
// How long to wait for a response to a stanza before giving up. // How long to wait for a response to a stanza before giving up.
reply-timeout = 15 seconds reply-timeout = 15 seconds

2
app/jitsi/config/videobridge.conf
View file

@ -66,7 +66,7 @@ videobridge {
port = {{ env "NOMAD_PORT_xmpp_port" }} port = {{ env "NOMAD_PORT_xmpp_port" }}
domain = "auth.jitsi" domain = "auth.jitsi"
username = "jvb" username = "jvb"
password = "{{ key "secrets/jitsi/jitsi_secret_jvb_user" }}" password = "{{ key "secrets/jitsi/jvb_pass" }}"
muc_jids = "jvbbrewery@internal.auth.jitsi" muc_jids = "jvbbrewery@internal.auth.jitsi"
# The muc_nickname must be unique across all jitsi-videobridge instances # The muc_nickname must be unique across all jitsi-videobridge instances
muc_nickname = "unique-jvb-server" muc_nickname = "unique-jvb-server"

25
app/jitsi/deploy/jitsi.hcl
View file

@ -23,10 +23,10 @@ job "jitsi" {
ports = [ "bosh_port", "xmpp_port" ] ports = [ "bosh_port", "xmpp_port" ]
network_mode = "host" network_mode = "host"
volumes = [ volumes = [
"secrets/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua" "secrets/prosody.cfg.lua:/etc/prosody/prosody.cfg.lua",
"secrets/certs/auth.jitsi.crt:/var/lib/prosody/auth.jitsi.crt" "secrets/certs/auth.jitsi.crt:/var/lib/prosody/auth.jitsi.crt",
"secrets/certs/auth.jitsi.key:/var/lib/prosody/auth.jitsi.key" "secrets/certs/auth.jitsi.key:/var/lib/prosody/auth.jitsi.key",
"secrets/certs/jitsi.crt:/var/lib/prosody/jitsi.crt" "secrets/certs/jitsi.crt:/var/lib/prosody/jitsi.crt",
"secrets/certs/jitsi.key:/var/lib/prosody/jitsi.key" "secrets/certs/jitsi.key:/var/lib/prosody/jitsi.key"
] ]
} }
@ -104,9 +104,9 @@ EOF
network_mode = "host" network_mode = "host"
ports = [ "https_port" ] ports = [ "https_port" ]
volumes = [ volumes = [
"secrets/certs/jitsi.crt:/etc/nginx/jitsi.crt" "secrets/certs/jitsi.crt:/etc/nginx/jitsi.crt",
"secrets/certs/jitsi.key:/etc/nginx/jitsi.key" "secrets/certs/jitsi.key:/etc/nginx/jitsi.key",
"secrets/config.js:/srv/jitsi-meet/config.js" "secrets/config.js:/srv/jitsi-meet/config.js",
"secrets/nginx.conf:/etc/nginx/nginx.conf" "secrets/nginx.conf:/etc/nginx/nginx.conf"
] ]
} }
@ -114,13 +114,11 @@ EOF
template { template {
data = file("../config/config.js") data = file("../config/config.js")
destination = "secrets/config.js" destination = "secrets/config.js"
env = true
} }
template { template {
data = file("../config/nginx.conf") data = file("../config/nginx.conf")
destination = "secrets/nginx.conf" destination = "secrets/nginx.conf"
env = true
} }
# --- secrets --- # --- secrets ---
@ -169,8 +167,8 @@ EOF
image = "superboum/amd64_jitsi_conference_focus:v7" image = "superboum/amd64_jitsi_conference_focus:v7"
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",
"secrets/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt" "secrets/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt",
"secrets/jicofo.conf:/etc/jitsi/jicofo.conf" "secrets/jicofo.conf:/etc/jitsi/jicofo.conf"
] ]
} }
@ -208,8 +206,8 @@ EOF
nproc = "65536:65536" nproc = "65536:65536"
} }
volumes = [ volumes = [
"secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt" "secrets/certs/jitsi.crt:/usr/local/share/ca-certificates/jitsi.crt",
"secrets/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt" "secrets/certs/auth.jitsi.crt:/usr/local/share/ca-certificates/auth.jitsi.crt",
"secrets/videobridge.conf:/etc/jitsi/videobridge.conf" "secrets/videobridge.conf:/etc/jitsi/videobridge.conf"
] ]
} }
@ -224,7 +222,6 @@ EOF
template { template {
data = file("../config/videobridge.conf") data = file("../config/videobridge.conf")
destination = "secrets/videobridge.conf" destination = "secrets/videobridge.conf"
env = true
} }
# --- secrets --- # --- secrets ---