Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3e7ec818af |
+1
-1
@@ -31,7 +31,7 @@ LETS_ENCRYPT_ENV=production
|
|||||||
#SSO_CLIENT_ID=cryptpad
|
#SSO_CLIENT_ID=cryptpad
|
||||||
#SSO_CLIENT_SECRET_VERSION=v1
|
#SSO_CLIENT_SECRET_VERSION=v1
|
||||||
#SSO_JWT_ALG=RS256
|
#SSO_JWT_ALG=RS256
|
||||||
#SSO_PLUGIN_VERSION=0.4.0
|
#SSO_PLUGIN_VERSION=1.0.0
|
||||||
|
|
||||||
## Adding OnlyOffice to cryptpad
|
## Adding OnlyOffice to cryptpad
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yaml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yaml"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
export CONFIG_VERSION=v2
|
export CONFIG_VERSION=v3
|
||||||
export CONFIG_JS_VERSION=v2
|
export CONFIG_JS_VERSION=v2
|
||||||
export NGINX_CONF_VERSION=v1
|
export NGINX_CONF_VERSION=v2
|
||||||
export SSO_ENTRYPOINT_VERSION=v6
|
export SSO_ENTRYPOINT_VERSION=v7
|
||||||
export SSO_JS_VERSION=v3
|
export SSO_JS_VERSION=v3
|
||||||
export APP_CONFIG_JS_VERSION=v1
|
export APP_CONFIG_JS_VERSION=v1
|
||||||
export ONLYOFFICE_ENTRYPOINT_VERSION=v1
|
export ONLYOFFICE_ENTRYPOINT_VERSION=v1
|
||||||
|
|||||||
+3
-3
@@ -3,14 +3,14 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: cryptpad/cryptpad:version-2026.5.1
|
image: cryptpad/cryptpad:version-2026.10.0
|
||||||
command: ["npm", "start"]
|
command: ["npm", "start"]
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
environment:
|
environment:
|
||||||
- CRYPTPAD_ADMIN_KEYS
|
- CRYPTPAD_ADMIN_KEYS
|
||||||
- "CPAD_MAIN_DOMAIN=${DOMAIN}"
|
- "CPAD_MAIN_DOMAIN=https://${DOMAIN}"
|
||||||
- "CPAD_SANDBOX_DOMAIN=${SANDBOX_DOMAIN}"
|
- "CPAD_SANDBOX_DOMAIN=https://${SANDBOX_DOMAIN}"
|
||||||
# Traefik can't use HTTP2 to communicate with cryptpad_websocket
|
# Traefik can't use HTTP2 to communicate with cryptpad_websocket
|
||||||
# A workaroung is disabling HTTP2 in Nginx
|
# A workaroung is disabling HTTP2 in Nginx
|
||||||
- "CPAD_HTTP2_DISABLE=true"
|
- "CPAD_HTTP2_DISABLE=true"
|
||||||
|
|||||||
+2
-2
@@ -46,7 +46,7 @@ module.exports = {
|
|||||||
* cryptpad/docs/example.nginx.conf (see the $main_domain variable)
|
* cryptpad/docs/example.nginx.conf (see the $main_domain variable)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
httpUnsafeOrigin: 'https://{{ env "CPAD_MAIN_DOMAIN" }}',
|
httpUnsafeOrigin: '{{ env "CPAD_MAIN_DOMAIN" }}',
|
||||||
|
|
||||||
/* httpSafeOrigin is the URL that is used for the 'sandbox' described above.
|
/* httpSafeOrigin is the URL that is used for the 'sandbox' described above.
|
||||||
* If you're testing or developing with CryptPad on your local machine then
|
* If you're testing or developing with CryptPad on your local machine then
|
||||||
@@ -67,7 +67,7 @@ module.exports = {
|
|||||||
*
|
*
|
||||||
* CUSTOMIZE AND UNCOMMENT THIS FOR PRODUCTION INSTALLATIONS.
|
* CUSTOMIZE AND UNCOMMENT THIS FOR PRODUCTION INSTALLATIONS.
|
||||||
*/
|
*/
|
||||||
httpSafeOrigin: 'https://{{ env "CPAD_SANDBOX_DOMAIN" }}',
|
httpSafeOrigin: '{{ env "CPAD_SANDBOX_DOMAIN" }}',
|
||||||
|
|
||||||
/* httpAddress specifies the address on which the nodejs server
|
/* httpAddress specifies the address on which the nodejs server
|
||||||
* should be accessible. By default it will listen on 127.0.0.1
|
* should be accessible. By default it will listen on 127.0.0.1
|
||||||
|
|||||||
+3
-2
@@ -23,9 +23,10 @@ server {
|
|||||||
proxy_set_header Connection upgrade;
|
proxy_set_header Connection upgrade;
|
||||||
}
|
}
|
||||||
|
|
||||||
# WebSocket endpoint
|
# WebSocket endpoint. CryptPad 2026.10+ serves HTTP and websocket on one
|
||||||
|
# port (public.httpPort); there is no separate websocket port any more.
|
||||||
location ^~ /cryptpad_websocket {
|
location ^~ /cryptpad_websocket {
|
||||||
proxy_pass http://{{ env "STACK_NAME" }}_app:3003;
|
proxy_pass http://{{ env "STACK_NAME" }}_app:3000;
|
||||||
|
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ fi
|
|||||||
|
|
||||||
PLUGIN_DIR="/cryptpad/lib/plugins/sso"
|
PLUGIN_DIR="/cryptpad/lib/plugins/sso"
|
||||||
VERSION_FILE="${PLUGIN_DIR}/.version"
|
VERSION_FILE="${PLUGIN_DIR}/.version"
|
||||||
SSO_PLUGIN_VERSION="${SSO_PLUGIN_VERSION:-0.4.0}"
|
SSO_PLUGIN_VERSION="${SSO_PLUGIN_VERSION:-1.0.0}"
|
||||||
|
|
||||||
# Copy SSO config template into place (mounted as Docker config)
|
# Copy SSO config template into place (mounted as Docker config)
|
||||||
if [ -f /sso.js ]; then
|
if [ -f /sso.js ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user