From bc166e7975e5e11e1cd6c760f6d4c128f56a289b Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 16 Jul 2020 12:38:50 +0300 Subject: [PATCH] Update docker base config --- docker/example-config.yaml | 12 ++++++++++++ docker/run.sh | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docker/example-config.yaml b/docker/example-config.yaml index 77a86b9..192a420 100644 --- a/docker/example-config.yaml +++ b/docker/example-config.yaml @@ -5,6 +5,18 @@ # Postgres: postgres://username:password@hostname/dbname database: sqlite:////data/maubot.db +# Database for encryption data. +crypto_database: + # Type of database. Either "default", "pickle" or "postgres". + # When set to default, using SQLite as the main database will use pickle as the crypto database + # and using Postgres as the main database will use the same one as the crypto database. + # + # When using pickle, individual crypto databases are stored in the pickle_dir directory. + # When using non-default postgres, postgres_uri is used to connect to postgres. + type: default + postgres_uri: postgres://username:password@hostname/dbname + pickle_dir: /data/crypto + plugin_directories: # The directory where uploaded new plugins should be stored. upload: /data/plugins diff --git a/docker/run.sh b/docker/run.sh index 6caf45a..96a60b9 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -6,7 +6,7 @@ function fixperms { cd /opt/maubot -mkdir -p /var/log/maubot /data/plugins /data/trash /data/dbs +mkdir -p /var/log/maubot /data/plugins /data/trash /data/dbs /data/crypto if [ ! -f /data/config.yaml ]; then cp docker/example-config.yaml /data/config.yaml