diff --git a/manual/config/env.md b/manual/config/env.md index 16a61f7f..3313891a 100644 --- a/manual/config/env.md +++ b/manual/config/env.md @@ -114,6 +114,9 @@ For configurations about Metadata server in `.env`, please refer [here](../exten - `NOTIFICATION_SERVER_URL`: The [notification server](../extension/notification-server.md) url, leave blank to disable it (default). +!!! note "In Seafile cluster or standalone-deployment notification server" + In addition to `NOTIFICATION_SERVER_URL`, you also need to specify `INNER_NOTIFICATION_SERVER_URL=$NOTIFICATION_SERVER_URL`, which will be used for the connection between Seafile server and notification server. + ## Cluster init configuration - `CLUSTER_INIT_MODE`: (only valid in pro edition at deploying first time). Cluster initialization mode, in which the necessary configuration files for the service to run will be generated (but **the service will not be started**). If the configuration file already exists, no operation will be performed. The default value is `true`. When the configuration file is generated, ***be sure to set this item to `false`***. diff --git a/manual/extension/notification-server.md b/manual/extension/notification-server.md index e08f7ffd..41f95d89 100644 --- a/manual/extension/notification-server.md +++ b/manual/extension/notification-server.md @@ -31,14 +31,19 @@ then add or modify `NOTIFICATION_SERVER_URL`: === "Deploy with Seafile" ```sh - NOTIFICATION_SERVER_URL=https://seafile.example.com/notification + NOTIFICATION_SERVER_URL=$SEAFILE_SERVER_PROTOCOL://$SEAFILE_SERVER_HOSTNAME/notification ``` === "Standalone deployment" ```sh NOTIFICATION_SERVER_URL= + INNER_NOTIFICATION_SERVER_URL=$NOTIFICATION_SERVER_URL ``` +!!! tip "Difference between `NOTIFICATION_SERVER_URL` and `INNER_NOTIFICATION_SERVER_URL`" + - `NOTIFICATION_SERVER_URL`: used to do the connection between client (i.e., user's browser) and notification server + - `INNER_NOTIFICATION_SERVER_URL`: used to do the connection between Seafile server and notification server + Finally, You can run notification server with the following command: ```sh @@ -48,7 +53,7 @@ docker compose up -d ## Checking notification server status -When the notification server is working, you can access `http://127.0.0.1:8083/ping` from your browser, which will answer `{"ret": "pong"}`. If you have a proxy configured, you can access `https://{server}/notification/ping` from your browser instead. +When the notification server is working, you can access `http://127.0.0.1:8083/ping` from your browser, which will answer `{"ret": "pong"}`. If you have a proxy configured, you can access `https://seafile.example.com/notification/ping` from your browser instead. ## Compatible client @@ -78,7 +83,6 @@ Then modify the `.env` file according to your environment. The following fields | variable | description | |------------------------|---------------------------------------------------------------------------------------------------------------| -| `NOTIFICATION_SERVER_VOLUME` | The volume directory of notification server data | | `SEAFILE_MYSQL_DB_HOST`| Seafile MySQL host | | `SEAFILE_MYSQL_DB_USER`| Seafile MySQL user, default is `seafile` | | `SEAFILE_MYSQL_DB_PASSWORD`| Seafile MySQL password | diff --git a/manual/repo/docker/ce/env b/manual/repo/docker/ce/env index ea0da2f9..b82d5425 100644 --- a/manual/repo/docker/ce/env +++ b/manual/repo/docker/ce/env @@ -10,7 +10,7 @@ SEAFILE_DB_IMAGE=mariadb:10.11 SEAFILE_REDIS_IMAGE=redis SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9-alpine SEADOC_IMAGE=seafileltd/sdoc-server:1.0-latest -NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:12.0-latest +NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:13.0-latest MD_IMAGE=seafileltd/seafile-md-server:latest ## Persistent Storage @@ -19,7 +19,6 @@ SEAFILE_VOLUME=$BASIC_STORAGE_PATH/seafile-data SEAFILE_MYSQL_VOLUME=$BASIC_STORAGE_PATH/seafile-mysql/db SEAFILE_CADDY_VOLUME=$BASIC_STORAGE_PATH/seafile-caddy SEADOC_VOLUME=$BASIC_STORAGE_PATH/seadoc-data -NOTIFICATION_SERVER_VOLUME=$BASIC_STORAGE_PATH/notification-data ################################# # Startup parameters # diff --git a/manual/repo/docker/ce/seafile-server.yml b/manual/repo/docker/ce/seafile-server.yml index 8ca49984..0e93dbc7 100644 --- a/manual/repo/docker/ce/seafile-server.yml +++ b/manual/repo/docker/ce/seafile-server.yml @@ -72,6 +72,7 @@ services: - REDIS_PASSWORD=${REDIS_PASSWORD:-} - MEMCACHED_HOST=${MEMCACHED_HOST:-memcached} - MEMCACHED_PORT=${MEMCACHED_PORT:-11211} + - INNER_NOTIFICATION_SERVER_URL=${INNER_NOTIFICATION_SERVER_URL:-http://notification-server:8083} - NOTIFICATION_SERVER_URL=${NOTIFICATION_SERVER_URL:-} - ENABLE_SEAFILE_AI=${ENABLE_SEAFILE_AI:-false} - SEAFILE_AI_SERVER_URL=${SEAFILE_AI_SERVER_URL:-http://seafile-ai:8888} diff --git a/manual/repo/docker/cluster/env b/manual/repo/docker/cluster/env index 759e7aa7..d10cb1da 100644 --- a/manual/repo/docker/cluster/env +++ b/manual/repo/docker/cluster/env @@ -44,6 +44,7 @@ S3_SSE_C_KEY= ## Notification NOTIFICATION_SERVER_URL= +INNER_NOTIFICATION_SERVER_URL=$NOTIFICATION_SERVER_URL ## Seafile AI ENABLE_SEAFILE_AI=false diff --git a/manual/repo/docker/cluster/seafile-server.yml b/manual/repo/docker/cluster/seafile-server.yml index 113f5ddb..e506555a 100644 --- a/manual/repo/docker/cluster/seafile-server.yml +++ b/manual/repo/docker/cluster/seafile-server.yml @@ -46,6 +46,7 @@ services: - SITE_ROOT=${SITE_ROOT:-/} - ENABLE_SEADOC=${ENABLE_SEADOC:-false} - SEADOC_SERVER_URL=${SEADOC_SERVER_URL:-http://seafile.example.com/sdoc-server} + - INNER_NOTIFICATION_SERVER_URL=${INNER_NOTIFICATION_SERVER_URL:-} - NOTIFICATION_SERVER_URL=${NOTIFICATION_SERVER_URL:-} - ENABLE_SEAFILE_AI=${ENABLE_SEAFILE_AI:-false} - SEAFILE_AI_SERVER_URL=$SEAFILE_AI_SERVER_URL diff --git a/manual/repo/docker/notification-server.yml b/manual/repo/docker/notification-server.yml index 980c3726..dd834187 100644 --- a/manual/repo/docker/notification-server.yml +++ b/manual/repo/docker/notification-server.yml @@ -1,12 +1,11 @@ services: notification-server: - image: ${NOTIFICATION_SERVER_IMAGE:-seafileltd/notification-server:12.0-latest} + image: ${NOTIFICATION_SERVER_IMAGE:-seafileltd/notification-server:13.0-latest} container_name: notification-server restart: always volumes: - - ${NOTIFICATION_SERVER_VOLUME:-/opt/notification-data}:/shared - - ${NOTIFICATION_SERVER_VOLUME:-/opt/notification-data}/logs:/shared/logs + - ${SEAFILE_VOLUME:-/opt/seafile-data}/seafile/logs:/shared/seafile/logs # ports: # - "8083:8083" environment: diff --git a/manual/repo/docker/notification-server/env b/manual/repo/docker/notification-server/env index 63b63f54..f52a83bd 100644 --- a/manual/repo/docker/notification-server/env +++ b/manual/repo/docker/notification-server/env @@ -2,9 +2,9 @@ COMPOSE_FILE='notification-server.yml' COMPOSE_PATH_SEPARATOR=',' -NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:12.0-latest +NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:13.0-latest -NOTIFICATION_SERVER_VOLUME=/opt/notification-data +SEAFILE_VOLUME=/opt/seafile-data SEAFILE_MYSQL_DB_HOST=192.168.0.2 SEAFILE_MYSQL_DB_USER=seafile diff --git a/manual/repo/docker/notification-server/notification-server.yml b/manual/repo/docker/notification-server/notification-server.yml index ad482528..46bfe5b5 100644 --- a/manual/repo/docker/notification-server/notification-server.yml +++ b/manual/repo/docker/notification-server/notification-server.yml @@ -1,12 +1,11 @@ services: notification-server: - image: ${NOTIFICATION_SERVER_IMAGE:-seafileltd/notification-server:12.0-latest} + image: ${NOTIFICATION_SERVER_IMAGE:-seafileltd/notification-server:13.0-latest} container_name: notification-server restart: always volumes: - - ${NOTIFICATION_SERVER_VOLUME:-/opt/notification-data}:/shared - - ${NOTIFICATION_SERVER_VOLUME:-/opt/notification-data}/logs:/shared/logs + - ${SEAFILE_VOLUME:-/opt/seafile-data}/seafile/logs:/shared/seafile/logs ports: - "8083:8083" environment: diff --git a/manual/repo/docker/pro/env b/manual/repo/docker/pro/env index a10a3997..97087de7 100644 --- a/manual/repo/docker/pro/env +++ b/manual/repo/docker/pro/env @@ -11,7 +11,7 @@ SEAFILE_REDIS_IMAGE=redis SEAFILE_ELASTICSEARCH_IMAGE=elasticsearch:8.15.0 SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9-alpine SEADOC_IMAGE=seafileltd/sdoc-server:1.0-latest -NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:12.0-latest +NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:13.0-latest #SEASEARCH_IMAGE=seafileltd/seasearch-nomkl:1.0-latest # Apple's Chip for SeaSearch SEASEARCH_IMAGE=seafileltd/seasearch:1.0-latest MD_IMAGE=seafileltd/seafile-md-server:latest @@ -29,7 +29,6 @@ SEAFILE_VOLUME=$BASIC_STORAGE_PATH/seafile-data SEAFILE_MYSQL_VOLUME=$BASIC_STORAGE_PATH/seafile-mysql/db SEAFILE_ELASTICSEARCH_VOLUME=$BASIC_STORAGE_PATH/seafile-elasticsearch/data SEAFILE_CADDY_VOLUME=$BASIC_STORAGE_PATH/seafile-caddy -NOTIFICATION_SERVER_VOLUME=$BASIC_STORAGE_PATH/notification-data SS_DATA_PATH=$BASIC_STORAGE_PATH/seasearch-data SEADOC_VOLUME=$BASIC_STORAGE_PATH/seadoc-data diff --git a/manual/repo/docker/pro/seafile-server.yml b/manual/repo/docker/pro/seafile-server.yml index 8ba5e617..198791a1 100644 --- a/manual/repo/docker/pro/seafile-server.yml +++ b/manual/repo/docker/pro/seafile-server.yml @@ -84,6 +84,7 @@ services: - S3_USE_HTTPS=${S3_USE_HTTPS:-true} - S3_PATH_STYLE_REQUEST=${S3_PATH_STYLE_REQUEST:-false} - S3_SSE_C_KEY=${S3_SSE_C_KEY:-} + - INNER_NOTIFICATION_SERVER_URL=${INNER_NOTIFICATION_SERVER_URL:-http://notification-server:8083} - NOTIFICATION_SERVER_URL=${NOTIFICATION_SERVER_URL:-} - ENABLE_SEAFILE_AI=${ENABLE_SEAFILE_AI:-false} - SEAFILE_AI_SERVER_URL=${SEAFILE_AI_SERVER_URL:-http://seafile-ai:8888} diff --git a/manual/repo/k8s/ce/seafile-deployment.yaml b/manual/repo/k8s/ce/seafile-deployment.yaml index a80967c9..b9c0a8cc 100644 --- a/manual/repo/k8s/ce/seafile-deployment.yaml +++ b/manual/repo/k8s/ce/seafile-deployment.yaml @@ -111,6 +111,11 @@ spec: configMapKeyRef: name: seafile-env key: MEMCACHED_PORT + - name: INNER_NOTIFICATION_SERVER_URL + valueFrom: + configMapKeyRef: + name: seafile-env + key: NOTIFICATION_SERVER_URL - name: NOTIFICATION_SERVER_URL valueFrom: configMapKeyRef: diff --git a/manual/repo/k8s/cluster/seafile-backend-deployment.yaml b/manual/repo/k8s/cluster/seafile-backend-deployment.yaml index 9f541e73..23d2cbd1 100644 --- a/manual/repo/k8s/cluster/seafile-backend-deployment.yaml +++ b/manual/repo/k8s/cluster/seafile-backend-deployment.yaml @@ -169,6 +169,11 @@ spec: configMapKeyRef: name: seafile-env key: S3_PATH_STYLE_REQUEST + - name: INNER_NOTIFICATION_SERVER_URL + valueFrom: + configMapKeyRef: + name: seafile-env + key: NOTIFICATION_SERVER_URL - name: NOTIFICATION_SERVER_URL valueFrom: configMapKeyRef: diff --git a/manual/repo/k8s/cluster/seafile-frontend-deployment.yaml b/manual/repo/k8s/cluster/seafile-frontend-deployment.yaml index 6263b4a5..b405fc16 100644 --- a/manual/repo/k8s/cluster/seafile-frontend-deployment.yaml +++ b/manual/repo/k8s/cluster/seafile-frontend-deployment.yaml @@ -154,6 +154,11 @@ spec: configMapKeyRef: name: seafile-env key: S3_PATH_STYLE_REQUEST + - name: INNER_NOTIFICATION_SERVER_URL + valueFrom: + configMapKeyRef: + name: seafile-env + key: NOTIFICATION_SERVER_URL - name: NOTIFICATION_SERVER_URL valueFrom: configMapKeyRef: diff --git a/manual/repo/k8s/pro/seafile-deployment.yaml b/manual/repo/k8s/pro/seafile-deployment.yaml index 644f4c73..6328487e 100644 --- a/manual/repo/k8s/pro/seafile-deployment.yaml +++ b/manual/repo/k8s/pro/seafile-deployment.yaml @@ -161,6 +161,11 @@ spec: configMapKeyRef: name: seafile-env key: MEMCACHED_PORT + - name: INNER_NOTIFICATION_SERVER_URL + valueFrom: + configMapKeyRef: + name: seafile-env + key: NOTIFICATION_SERVER_URL - name: NOTIFICATION_SERVER_URL valueFrom: configMapKeyRef: