From 6da7ecfa9f001f3a51a1bb183c782821934dec0c Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 11 Feb 2020 22:36:45 +0100
Subject: Move ccnet.conf to ccnet.conf.tpl

---
 consul/configuration/.gitignore                  |  1 -
 consul/configuration/seafile/conf/ccnet.conf     | 29 ------------------------
 consul/configuration/seafile/conf/ccnet.conf.tpl | 29 ++++++++++++++++++++++++
 nomad/seafile.hcl                                |  2 +-
 4 files changed, 30 insertions(+), 31 deletions(-)
 delete mode 100644 consul/configuration/seafile/conf/ccnet.conf
 create mode 100644 consul/configuration/seafile/conf/ccnet.conf.tpl

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
deleted file mode 100644
index 2395a9b..0000000
--- a/consul/configuration/seafile/conf/ccnet.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-[General]
-USER_NAME = deuxfleurs
-ID = {{ key "secrets/seafile/ccnet/seafile_id" | trimSpace }}
-NAME = deuxfleurs
-SERVICE_URL = https://cloud.deuxfleurs.fr
-
-[Network]
-PORT = 10001
-
-[Client]
-PORT = 13418
-
-[LDAP]
-HOST = ldap://bottin2.service.2.cluster.deuxfleurs.fr/
-BASE = ou=users,dc=deuxfleurs,dc=fr
-USER_DN = {{ key "secrets/seafile/ccnet/ldap_binddn" | trimSpace }}
-FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr
-PASSWORD = {{ key "secrets/seafile/ccnet/ldap_bindpwd" | trimSpace }}
-LOGIN_ATTR = mail
-
-[Database]
-ENGINE = mysql
-HOST = mariadb.service.2.cluster.deuxfleurs.fr
-PORT = 3306
-USER = seafile
-PASSWD = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}
-DB = ccnet-db
-CONNECTION_CHARSET = utf8
-
diff --git a/consul/configuration/seafile/conf/ccnet.conf.tpl b/consul/configuration/seafile/conf/ccnet.conf.tpl
new file mode 100644
index 0000000..2395a9b
--- /dev/null
+++ b/consul/configuration/seafile/conf/ccnet.conf.tpl
@@ -0,0 +1,29 @@
+[General]
+USER_NAME = deuxfleurs
+ID = {{ key "secrets/seafile/ccnet/seafile_id" | trimSpace }}
+NAME = deuxfleurs
+SERVICE_URL = https://cloud.deuxfleurs.fr
+
+[Network]
+PORT = 10001
+
+[Client]
+PORT = 13418
+
+[LDAP]
+HOST = ldap://bottin2.service.2.cluster.deuxfleurs.fr/
+BASE = ou=users,dc=deuxfleurs,dc=fr
+USER_DN = {{ key "secrets/seafile/ccnet/ldap_binddn" | trimSpace }}
+FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr
+PASSWORD = {{ key "secrets/seafile/ccnet/ldap_bindpwd" | trimSpace }}
+LOGIN_ATTR = mail
+
+[Database]
+ENGINE = mysql
+HOST = mariadb.service.2.cluster.deuxfleurs.fr
+PORT = 3306
+USER = seafile
+PASSWD = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}
+DB = ccnet-db
+CONNECTION_CHARSET = utf8
+
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"
       }
-- 
cgit v1.2.3