Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 10 Pull requests 2 Projects Releases Wiki Activity

Compare commits

base: Deuxfleurs:fix_ports_conflicts
Branches Tags
Deuxfleurs:main
Deuxfleurs:fix_ports_conflicts
Deuxfleurs:debug-cryptpad-update
Deuxfleurs:telemetry-update
Deuxfleurs:jitsi
Deuxfleurs:feat/im-tls-proxy
Deuxfleurs:simplify-network-config
Deuxfleurs:plume-s3
Deuxfleurs:wgautomesh-service-v2
Deuxfleurs:refactor
..
compare: Deuxfleurs:main
Branches Tags
Deuxfleurs:fix_ports_conflicts
Deuxfleurs:main
Deuxfleurs:debug-cryptpad-update
Deuxfleurs:telemetry-update
Deuxfleurs:jitsi
Deuxfleurs:feat/im-tls-proxy
Deuxfleurs:simplify-network-config
Deuxfleurs:plume-s3
Deuxfleurs:wgautomesh-service-v2
Deuxfleurs:refactor

No commits in common. "fix_ports_conflicts" and "main" have entirely different histories.
fix_ports_ ... main

4 changed files with 3 additions and 6 deletions
Show stats Expand all files Collapse all files

4
cluster/prod/app/bagage/deploy/bagage.hcl
View file

@ -13,8 +13,8 @@ job "bagage" {
network { network {
port "web_port" { port "web_port" {
static = 8015 static = 8080
to = 8015 to = 8080
} }
port "ssh_port" { port "ssh_port" {
static = 2222 static = 2222

3
cluster/prod/app/email/deploy/email-android7.hcl
View file

@ -1,6 +1,5 @@
job "email-android7" { job "email-android7" {
# Should not run on the same site as email.hcl (port conflict in diplonat) datacenters = ["neptune", "bespin"]
datacenters = ["scorpio", "bespin"]
type = "service" type = "service"
priority = 100 priority = 100

1
cluster/prod/app/email/deploy/email.hcl
View file

@ -1,5 +1,4 @@
job "email" { job "email" {
# Should not run on the same site as email-android7.hcl (port conflict in diplonat)
datacenters = ["neptune"] datacenters = ["neptune"]
type = "service" type = "service"
priority = 65 priority = 65

1
doc/ports
View file

@ -37,7 +37,6 @@ ports so that we can avoid conflicts when adding services.
5432 psql_proxy 5432 psql_proxy
5433 postgresql 5433 postgresql
8008 synapse 8008 synapse
8015 bagage
8080 jitsi video bridge (prod) / reserved (staging) 8080 jitsi video bridge (prod) / reserved (staging)
8300 consul 8300 consul
8301 consul 8301 consul