aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2020-02-11 22:36:45 +0100
committerAlex Auvolat <alex@adnab.me>2020-02-15 16:20:47 +0100
commit6da7ecfa9f001f3a51a1bb183c782821934dec0c (patch)
treedfa5c3810c6d8e82d7f3afad5467ffc6667858b3
parentacdb34027b361cccfe6200ed8f087aa146d0ab55 (diff)
downloadinfrastructure-6da7ecfa9f001f3a51a1bb183c782821934dec0c.tar.gz
infrastructure-6da7ecfa9f001f3a51a1bb183c782821934dec0c.zip
Move ccnet.conf to ccnet.conf.tpl
-rw-r--r--consul/configuration/.gitignore1
-rw-r--r--consul/configuration/seafile/conf/ccnet.conf.tpl (renamed from consul/configuration/seafile/conf/ccnet.conf)0
-rw-r--r--nomad/seafile.hcl2
3 files changed, 1 insertions, 2 deletions
diff --git a/consul/configuration/.gitignore b/consul/configuration/.gitignore
index d54ae44..8c55cc6 100644
--- a/consul/configuration/.gitignore
+++ b/consul/configuration/.gitignore
@@ -10,7 +10,6 @@
# Whitelist specific files
!seafile/conf/seafdav.conf
-!seafile/conf/ccnet.conf
!seafile/ccnet/seafile.ini
!email/dkim/keytable
diff --git a/consul/configuration/seafile/conf/ccnet.conf b/consul/configuration/seafile/conf/ccnet.conf.tpl
index 2395a9b..2395a9b 100644
--- a/consul/configuration/seafile/conf/ccnet.conf
+++ b/consul/configuration/seafile/conf/ccnet.conf.tpl
diff --git a/nomad/seafile.hcl b/nomad/seafile.hcl
index 1ffd1a1..dc076c6 100644
--- a/nomad/seafile.hcl
+++ b/nomad/seafile.hcl
@@ -112,7 +112,7 @@ job "seafile" {
}
artifact {
- source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/ccnet.conf?raw"
+ source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/ccnet.conf.tpl?raw"
destination = "secrets/conf/ccnet.conf.tpl"
mode = "file"
}