From afaf89f7512036318bd7a187c91e19601b7470d6 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Sat, 15 Feb 2020 16:02:16 +0100
Subject: [PATCH] Add missing templated passwords

---
 .../{seafile.conf.sample => seafile.conf.tpl} |  2 +-
 ...tings.py.sample => seahub_settings.py.tpl} |  2 +-
 nomad/seafile.hcl                             | 30 +++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)
 rename consul/configuration/seafile/conf/{seafile.conf.sample => seafile.conf.tpl} (79%)
 rename consul/configuration/seafile/conf/{seahub_settings.py.sample => seahub_settings.py.tpl} (89%)

diff --git a/consul/configuration/seafile/conf/seafile.conf.sample b/consul/configuration/seafile/conf/seafile.conf.tpl
similarity index 79%
rename from consul/configuration/seafile/conf/seafile.conf.sample
rename to 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
similarity index 89%
rename from consul/configuration/seafile/conf/seahub_settings.py.sample
rename to 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 dc076c6..f118999 100644
--- a/nomad/seafile.hcl
+++ b/nomad/seafile.hcl
@@ -116,11 +116,31 @@ job "seafile" {
         destination = "secrets/conf/ccnet.conf.tpl"
         mode = "file"
       }
-	    template {
+	  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"
@@ -137,14 +157,6 @@ job "seafile" {
         data = "{{ key \"configuration/seafile/conf/seafdav.conf\" }}"
         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"