aboutsummaryrefslogtreecommitdiff
path: root/nomad
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2019-12-04 16:54:59 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2019-12-04 16:54:59 +0100
commit0b3eb8ec1b3ba3691410744f6397437c9832e74d (patch)
tree88dbd13fc1ff2e9a7e3773d88143c8bc68b05a63 /nomad
parentede3a300e5ac2567ea15db6fe40ddd9b7510d9e3 (diff)
parent08f3ef8c179b499f6b6051ad95a66ea9d352e5f9 (diff)
downloadinfrastructure-0b3eb8ec1b3ba3691410744f6397437c9832e74d.tar.gz
infrastructure-0b3eb8ec1b3ba3691410744f6397437c9832e74d.zip
Merge branch 'master' of gitlab.com:superboum/deuxfleurs.fr
Diffstat (limited to 'nomad')
-rw-r--r--nomad/chat.hcl13
-rw-r--r--nomad/seafile.hcl7
2 files changed, 18 insertions, 2 deletions
diff --git a/nomad/chat.hcl b/nomad/chat.hcl
index 50c657b..a0c5397 100644
--- a/nomad/chat.hcl
+++ b/nomad/chat.hcl
@@ -29,7 +29,7 @@ job "chat" {
}
artifact {
- source = "http://127.0.0.1:8500/v1/kv/configuration/chat/synapse/homeserver.yaml?raw&a=a"
+ source = "http://127.0.0.1:8500/v1/kv/configuration/chat/synapse/homeserver.yaml?raw"
destination = "secrets/tpl/homeserver.yaml.tpl"
mode = "file"
}
@@ -37,6 +37,17 @@ job "chat" {
source = "secrets/tpl/homeserver.yaml.tpl"
destination = "secrets/conf/homeserver.yaml"
}
+
+ artifact {
+ source = "http://127.0.0.1:8500/v1/kv/configuration/chat/fb2mx/registration.yaml?raw"
+ destination = "secrets/tpl/fb2mx_registration.yaml.tpl"
+ mode = "file"
+ }
+ template {
+ source = "secrets/tpl/fb2mx_registration.yaml.tpl"
+ destination = "secrets/conf/fb2mx_registration.yaml"
+ }
+
template {
data = "{{ key \"configuration/chat/synapse/log.yaml\" }}"
destination = "secrets/conf/log.yaml"
diff --git a/nomad/seafile.hcl b/nomad/seafile.hcl
index 574f6bc..c930396 100644
--- a/nomad/seafile.hcl
+++ b/nomad/seafile.hcl
@@ -12,7 +12,12 @@ job "seafile" {
task "server" {
driver = "docker"
config {
- image = "superboum/amd64_seafile:v4"
+ image = "superboum/amd64_seafile:v6"
+
+ ## cmd + args are used for running an instance attachable for update
+ # command = "/bin/sleep"
+ # args = ["999999"]
+
port_map {
seahub_port = 8000
seafdav_port = 8084