Compare commits
No commits in common. "183b33db4d0ecb46b36a8cc57fc9ff30b9430ac6" and "6065adef2ce1c0c05fb2711d776b499157d785da" have entirely different histories.
183b33db4d
...
6065adef2c
1 changed files with 2 additions and 27 deletions
|
@ -121,7 +121,7 @@ job "matrix" {
|
||||||
port: 5433
|
port: 5433
|
||||||
cp_min: 5
|
cp_min: 5
|
||||||
cp_max: 10
|
cp_max: 10
|
||||||
log_config: "{{ env "NOMAD_TASK_DIR" }}/log_config.yaml"
|
log_config: "/data/brmartin.co.uk.log.config"
|
||||||
registration_shared_secret: "{{ with nomadVar "nomad/jobs/matrix/synapse/synapse" }}{{ .registration_shared_secret }}{{ end }}"
|
registration_shared_secret: "{{ with nomadVar "nomad/jobs/matrix/synapse/synapse" }}{{ .registration_shared_secret }}{{ end }}"
|
||||||
report_stats: true
|
report_stats: true
|
||||||
macaroon_secret_key: "{{ with nomadVar "nomad/jobs/matrix/synapse/synapse" }}{{ .macaroon_secret_key }}{{ end }}"
|
macaroon_secret_key: "{{ with nomadVar "nomad/jobs/matrix/synapse/synapse" }}{{ .macaroon_secret_key }}{{ end }}"
|
||||||
|
@ -132,6 +132,7 @@ job "matrix" {
|
||||||
- server_name: "matrix.org"
|
- server_name: "matrix.org"
|
||||||
app_service_config_files:
|
app_service_config_files:
|
||||||
- /local/matrix-whatsapp-registration.yaml
|
- /local/matrix-whatsapp-registration.yaml
|
||||||
|
- /data/matrix-instagram-registration.yaml
|
||||||
turn_uris: [ "turn:turn.brmartin.co.uk?transport=udp", "turn:turn.brmartin.co.uk?transport=tcp" ]
|
turn_uris: [ "turn:turn.brmartin.co.uk?transport=udp", "turn:turn.brmartin.co.uk?transport=tcp" ]
|
||||||
turn_shared_secret: "{{ with nomadVar "nomad/jobs/matrix/synapse/synapse" }}{{ .turn_shared_secret }}{{ end }}"
|
turn_shared_secret: "{{ with nomadVar "nomad/jobs/matrix/synapse/synapse" }}{{ .turn_shared_secret }}{{ end }}"
|
||||||
turn_user_lifetime: 86400000
|
turn_user_lifetime: 86400000
|
||||||
|
@ -185,32 +186,6 @@ job "matrix" {
|
||||||
destination = "local/synapse-config.yaml"
|
destination = "local/synapse-config.yaml"
|
||||||
}
|
}
|
||||||
|
|
||||||
template {
|
|
||||||
data = <<-EOF
|
|
||||||
version: 1
|
|
||||||
formatters:
|
|
||||||
structured:
|
|
||||||
class: synapse.logging.TerseJsonFormatter
|
|
||||||
handlers:
|
|
||||||
console:
|
|
||||||
class: logging.StreamHandler
|
|
||||||
formatter: structured
|
|
||||||
loggers:
|
|
||||||
synapse.federation.transport.server.federation:
|
|
||||||
level: WARN
|
|
||||||
synapse.access.http.8008:
|
|
||||||
level: WARN
|
|
||||||
synapse.util.caches.response_cache:
|
|
||||||
level: WARN
|
|
||||||
root:
|
|
||||||
level: WARN
|
|
||||||
handlers: [console]
|
|
||||||
disable_existing_loggers: false
|
|
||||||
EOF
|
|
||||||
|
|
||||||
destination = "local/log_config.yaml"
|
|
||||||
}
|
|
||||||
|
|
||||||
resources {
|
resources {
|
||||||
cpu = 500
|
cpu = 500
|
||||||
memory = 256
|
memory = 256
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue