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: Add missing templated passwords

---
 .../configuration/seafile/conf/seafile.conf.sample  | 19 -------------------
 consul/configuration/seafile/conf/seafile.conf.tpl  | 19 +++++++++++++++++++
 .../seafile/conf/seahub_settings.py.sample          | 21 ---------------------
 .../seafile/conf/seahub_settings.py.tpl             | 21 +++++++++++++++++++++
 4 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 consul/configuration/seafile/conf/seafile.conf.sample
 create mode 100644 consul/configuration/seafile/conf/seafile.conf.tpl
 delete mode 100644 consul/configuration/seafile/conf/seahub_settings.py.sample
 create mode 100644 consul/configuration/seafile/conf/seahub_settings.py.tpl

(limited to 'consul/configuration')

diff --git a/consul/configuration/seafile/conf/seafile.conf.sample b/consul/configuration/seafile/conf/seafile.conf.sample
deleted file mode 100644
index cfe3592..0000000
--- a/consul/configuration/seafile/conf/seafile.conf.sample
+++ /dev/null
@@ -1,19 +0,0 @@
-[network]
-port = 12001
-
-[fileserver]
-port = 8082
-max_upload_size=8192
-max_download_dir_size=8192
-
-[database]
-type = mysql
-host = mariadb.service.2.cluster.deuxfleurs.fr
-port = 3306
-user = seafile
-password = <to be defined>
-db_name = seafile-db
-connection_charset = utf8
-
-[quota]
-default = 50
diff --git a/consul/configuration/seafile/conf/seafile.conf.tpl b/consul/configuration/seafile/conf/seafile.conf.tpl
new file mode 100644
index 0000000..f224234
--- /dev/null
+++ b/consul/configuration/seafile/conf/seafile.conf.tpl
@@ -0,0 +1,19 @@
+[network]
+port = 12001
+
+[fileserver]
+port = 8082
+max_upload_size=8192
+max_download_dir_size=8192
+
+[database]
+type = mysql
+host = mariadb.service.2.cluster.deuxfleurs.fr
+port = 3306
+user = seafile
+password = {{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}
+db_name = seafile-db
+connection_charset = utf8
+
+[quota]
+default = 50
diff --git a/consul/configuration/seafile/conf/seahub_settings.py.sample b/consul/configuration/seafile/conf/seahub_settings.py.sample
deleted file mode 100644
index 06aa7d3..0000000
--- a/consul/configuration/seafile/conf/seahub_settings.py.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-SECRET_KEY = "8ep+sgi&s1-f2cq2178!ekk!0h0nw2y4z1-olbaopxmodsd8vk"
-FILE_SERVER_ROOT = 'https://cloud.deuxfleurs.fr/seafhttp'
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'seahub-db',
-        'USER': 'seafile',
-        'PASSWORD': '<to be defined>',
-        'HOST': 'mariadb.service.2.cluster.deuxfleurs.fr',
-        'PORT': '3306',
-        'OPTIONS': {
-            'init_command': 'SET storage_engine=INNODB',
-        }
-    }
-}
-FILE_PREVIEW_MAX_SIZE = 100 * 1024 * 1024
-ENABLE_THUMBNAIL = True
-THUMBNAIL_ROOT = '/mnt/seafile-data/thumbnail/thumb/'
-THUMBNAIL_EXTENSION = 'png'
-THUMBNAIL_DEFAULT_SIZE = '24'
-PREVIEW_DEFAULT_SIZE = '300'
diff --git a/consul/configuration/seafile/conf/seahub_settings.py.tpl b/consul/configuration/seafile/conf/seahub_settings.py.tpl
new file mode 100644
index 0000000..6c63ee4
--- /dev/null
+++ b/consul/configuration/seafile/conf/seahub_settings.py.tpl
@@ -0,0 +1,21 @@
+SECRET_KEY = "8ep+sgi&s1-f2cq2178!ekk!0h0nw2y4z1-olbaopxmodsd8vk"
+FILE_SERVER_ROOT = 'https://cloud.deuxfleurs.fr/seafhttp'
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'seahub-db',
+        'USER': 'seafile',
+        'PASSWORD': '{{ key "secrets/seafile/ccnet/mysql_pwd" | trimSpace }}',
+        'HOST': 'mariadb.service.2.cluster.deuxfleurs.fr',
+        'PORT': '3306',
+        'OPTIONS': {
+            'init_command': 'SET storage_engine=INNODB',
+        }
+    }
+}
+FILE_PREVIEW_MAX_SIZE = 100 * 1024 * 1024
+ENABLE_THUMBNAIL = True
+THUMBNAIL_ROOT = '/mnt/seafile-data/thumbnail/thumb/'
+THUMBNAIL_EXTENSION = 'png'
+THUMBNAIL_DEFAULT_SIZE = '24'
+PREVIEW_DEFAULT_SIZE = '300'
-- 
cgit v1.2.3