Merge branch 'wip_seafile' of Deuxfleurs/deuxfleurs.fr into master

4 files changed, 36 insertions, 18 deletions

diff --git a/consul/configuration/seafile/conf/ccnet.conf.sample b/consul/configuration/seafile/conf/ccnet.conf.tpl
index 76f4da9..2395a9b 100644
--- a/consul/configuration/seafile/conf/ccnet.conf.sample
+++ b/consul/configuration/seafile/conf/ccnet.conf.tpl
@@ -1,6 +1,6 @@
 [General]
 USER_NAME = deuxfleurs
-ID = <to be defined>
+ID = {{ key "secrets/seafile/ccnet/seafile_id" | trimSpace }}
 NAME = deuxfleurs
 SERVICE_URL = https://cloud.deuxfleurs.fr
 
@@ -13,9 +13,9 @@ PORT = 13418
 [LDAP]
 HOST = ldap://bottin2.service.2.cluster.deuxfleurs.fr/
 BASE = ou=users,dc=deuxfleurs,dc=fr
-USER_DN = cn=<to be defined>,dc=deuxfleurs,dc=fr
+USER_DN = {{ key "secrets/seafile/ccnet/ldap_binddn" | trimSpace }}
 FILTER = memberOf=CN=seafile,OU=groups,DC=deuxfleurs,DC=fr
-PASSWORD = <to be defined>
+PASSWORD = {{ key "secrets/seafile/ccnet/ldap_bindpwd" | trimSpace }}
 LOGIN_ATTR = mail
 
 [Database]
@@ -23,7 +23,7 @@ ENGINE = mysql
 HOST = mariadb.service.2.cluster.deuxfleurs.fr
 PORT = 3306
 USER = seafile
-PASSWD = <to be defined>
+PASSWD = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}
 DB = ccnet-db
 CONNECTION_CHARSET = utf8
 
diff --git a/consul/configuration/seafile/conf/seafile.conf.sample b/consul/configuration/seafile/conf/seafile.conf.tpl
index cfe3592..f224234 100644
--- a/consul/configuration/seafile/conf/seafile.conf.sample
+++ b/consul/configuration/seafile/conf/seafile.conf.tpl
@@ -11,7 +11,7 @@ type = mysql
 host = mariadb.service.2.cluster.deuxfleurs.fr
 port = 3306
 user = seafile
-password = <to be defined>
+password = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}
 db_name = seafile-db
 connection_charset = utf8
 
diff --git a/consul/configuration/seafile/conf/seahub_settings.py.sample b/consul/configuration/seafile/conf/seahub_settings.py.tpl
index 06aa7d3..6c63ee4 100644
--- a/consul/configuration/seafile/conf/seahub_settings.py.sample
+++ b/consul/configuration/seafile/conf/seahub_settings.py.tpl
@@ -5,7 +5,7 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'seahub-db',
         'USER': 'seafile',
-        'PASSWORD': '<to be defined>',
+        'PASSWORD': '{{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}',
         'HOST': 'mariadb.service.2.cluster.deuxfleurs.fr',
         'PORT': '3306',
         'OPTIONS': {
diff --git a/nomad/seafile.hcl b/nomad/seafile.hcl
index c930396..f118999 100644
--- a/nomad/seafile.hcl
+++ b/nomad/seafile.hcl
@@ -111,6 +111,36 @@ job "seafile" {
         }
       }
 
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/ccnet.conf.tpl?raw"
+        destination = "secrets/conf/ccnet.conf.tpl"
+        mode = "file"
+      }
+	  template {
+        source = "secrets/conf/ccnet.conf.tpl"
+        destination = "secrets/conf/ccnet.conf"
+      }
+
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/seafile.conf.tpl?raw"
+        destination = "secrets/conf/seafile.conf.tpl"
+        mode = "file"
+      }
+      template {
+		source = "secrets/conf/seafile.conf.tpl"
+        destination = "secrets/conf/seafile.conf"
+      }
+
+      artifact {
+        source = "http://127.0.0.1:8500/v1/kv/configuration/seafile/conf/seahub_settings.py.tpl?raw"
+        destination = "secrets/conf/seahub_settings.py.tpl"
+        mode = "file"
+      }
+      template {
+        source = "secrets/conf/seahub_settings.py.tpl"
+        destination = "secrets/conf/seahub_settings.py"
+      }
+
       template {
         data = "{{ key \"configuration/seafile/ccnet/mykey.peer\" }}"
         destination = "secrets/ccnet/mykey.peer"
@@ -120,10 +150,6 @@ job "seafile" {
         destination = "secrets/ccnet/seafile.ini"
       }
       template {
-        data = "{{ key \"configuration/seafile/conf/ccnet.conf\" }}"
-        destination = "secrets/conf/ccnet.conf"
-      }
-      template {
         data = "{{ key \"configuration/seafile/conf/mykey.peer\" }}"
         destination = "secrets/conf/mykey.peer"
       }
@@ -132,14 +158,6 @@ job "seafile" {
         destination = "secrets/conf/seafdav.conf"
       }
       template {
-        data = "{{ key \"configuration/seafile/conf/seafile.conf\" }}"
-        destination = "secrets/conf/seafile.conf"
-      }
-      template {
-        data = "{{ key \"configuration/seafile/conf/seahub_settings.py\" }}"
-        destination = "secrets/conf/seahub_settings.py"
-      }
-      template {
         data = "{{ key \"configuration/seafile/conf/gunicorn.conf\" }}"
         destination = "secrets/conf/gunicorn.conf"
       }