From 2f90c675ecbf89e0ec47d8a69a2376972b960492 Mon Sep 17 00:00:00 2001 From: skywalker Date: Tue, 3 Sep 2024 17:56:43 +0800 Subject: [PATCH] config in env --- manual/docker/docker-compose/seadoc/1.0/seadoc.yml | 5 +++-- .../seadoc/1.0/standalone/docker-compose.yml | 5 +++-- manual/docker/docker-compose/seadoc/1.0/standalone/env | 7 +++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manual/docker/docker-compose/seadoc/1.0/seadoc.yml b/manual/docker/docker-compose/seadoc/1.0/seadoc.yml index c21acbe4..3e0c8658 100644 --- a/manual/docker/docker-compose/seadoc/1.0/seadoc.yml +++ b/manual/docker/docker-compose/seadoc/1.0/seadoc.yml @@ -12,9 +12,10 @@ services: - DB_PASSWD=${SEAFILE_MYSQL_DB_PASSWD:?Variable is not set or empty} - DB_NAME=${SEADOC_MYSQL_DB_NAME:-seahub_db} - TIME_ZONE=${TIME_ZONE:-Etc/UTC} - - SEADOC_SERVER_LETSENCRYPT=${SEADOC_SERVER_LETSENCRYPT:-false} - - SEADOC_SERVER_HOSTNAME=${SEADOC_SERVER_HOSTNAME:-sdoc-server.example.com} + - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty} - SEAHUB_SERVICE_URL=${SEAHUB_SERVICE_URL:-http://seafile.example.com} + - FILE_SERVER_ROOT=${FILE_SERVER_ROOT:-http://seafile.example.com/seafhttp} + - SEADOC_SERVER_URL=${SEAHUB_SERVICE_URL:-http://seafile.example.com/sdoc-server} networks: - seafile-net diff --git a/manual/docker/docker-compose/seadoc/1.0/standalone/docker-compose.yml b/manual/docker/docker-compose/seadoc/1.0/standalone/docker-compose.yml index db0264d4..cbb31b07 100644 --- a/manual/docker/docker-compose/seadoc/1.0/standalone/docker-compose.yml +++ b/manual/docker/docker-compose/seadoc/1.0/standalone/docker-compose.yml @@ -15,9 +15,10 @@ services: - DB_PASSWD=${SEAFILE_MYSQL_DB_PASSWD:?Variable is not set or empty} - DB_NAME=${SEADOC_MYSQL_DB_NAME:-seahub_db} - TIME_ZONE=${TIME_ZONE:-Etc/UTC} - - SEADOC_SERVER_LETSENCRYPT=${SEADOC_SERVER_LETSENCRYPT:-false} - - SEADOC_SERVER_HOSTNAME=${SEADOC_SERVER_HOSTNAME:-sdoc-server.example.com} + - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty} - SEAHUB_SERVICE_URL=${SEAHUB_SERVICE_URL:-http://seafile.example.com} + - FILE_SERVER_ROOT=${FILE_SERVER_ROOT:-http://seafile.example.com/seafhttp} + - SEADOC_SERVER_URL=${SEAHUB_SERVICE_URL:-http://seadoc.example.com} networks: - seafile-net diff --git a/manual/docker/docker-compose/seadoc/1.0/standalone/env b/manual/docker/docker-compose/seadoc/1.0/standalone/env index 8d7ab926..491a89bd 100644 --- a/manual/docker/docker-compose/seadoc/1.0/standalone/env +++ b/manual/docker/docker-compose/seadoc/1.0/standalone/env @@ -3,7 +3,6 @@ COMPOSE_PATH_SEPARATOR=',' SEADOC_IMAGE=seafileltd/sdoc-server:latest -SEADOC_VOLUMES=/opt/seadoc-data SEAFILE_MYSQL_DB_HOST=192.168.0.2 SEAFILE_MYSQL_DB_USER=seafile @@ -11,8 +10,8 @@ SEAFILE_MYSQL_DB_PASSWD=PASSWORD TIME_ZONE=Etc/UTC +JWT_PRIVATE_KEY= SEAHUB_SERVICE_URL=http://seafile.example.com +FILE_SERVER_ROOT=http://seafile.example.com/seafhttp +SEADOC_SERVER_URL=http://seadoc.example.com -SEADOC_SERVER_HOSTNAME=sdoc-server.example.com -SEADOC_SERVER_LETSENCRYPT=false -SEADOC_SSL_PORT=