The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Add link to OnlyOffice license to docker-compose

Browse Source
This commit is contained in:
Wolfgang Ginolas 2024-03-19 11:28:27 +01:00 committed by wginolas
parent d8cb5c02bd
commit b014e16f1c
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -34,3 +34,4 @@ www/common/onlyoffice/v*
/www/common/onlyoffice/dist/
/onlyoffice-conf/
/onlyoffice-dist/

7
docker-compose.yml
View File

@ -15,8 +15,11 @@ services:
- CPAD_SANDBOX_DOMAIN=https://your-sandbox-domain.com
- CPAD_CONF=/cryptpad/config/config.js
# Uncomment the next line, when you want to use OnlyOffice on
# your installation. TODO add link to license
# Uncomment the next line, if you want to use OnlyOffice on
# your installation.
#
# Read and accept this before doing this:
# https://github.com/ONLYOFFICE/web-apps/blob/master/LICENSE.txt
# - CPAD_INSTALL_ONLYOFFICE=yes
volumes:

8
install-onlyoffice.sh
View File

@ -110,7 +110,7 @@ ensure_oo_is_downloaded () {
ensure_command_available git
if ! [ -d "$BUILDS_DIR" ]; then
echo Downloading OnlyOffice...
echo "Downloading OnlyOffice..."
git clone --bare https://github.com/cryptpad/onlyoffice-builds.git "$BUILDS_DIR"
fi
}
@ -134,9 +134,9 @@ install_version () {
echo "$COMMIT" > "$FULL_DIR"/.commit
echo "$DIR" updated
echo "$DIR updated"
else
echo "$DIR" was up to date
echo "$DIR was up to date"
fi
@ -147,7 +147,7 @@ install_version () {
ensure_command_available () {
if ! command -v "$1" &> /dev/null; then
echo "$1" needs to be installed to run this script
echo "$1 needs to be installed to run this script"
exit 1
fi
}

4
www/checkup/main.js
View File

@ -421,7 +421,7 @@ define([
});
});
var sheetURL = '/common/onlyoffice/dist/v5/web-apps/apps/spreadsheeteditor/main/index.html';
var sheetURL = '/common/onlyoffice/dist/v7/web-apps/apps/spreadsheeteditor/main/index.html';
assert(function (cb, msg) {
msg.innerText = "Missing HTTP headers required for .xlsx export from sheets. ";
@ -718,7 +718,7 @@ define([
});
assert(function (cb, msg) { // FIXME possibly superseded by more advanced CSP tests?
var url = '/common/onlyoffice/dist/v5/web-apps/apps/spreadsheeteditor/main/index.html';
var url = '/common/onlyoffice/dist/v7/web-apps/apps/spreadsheeteditor/main/index.html';
msg.appendChild(CSP_WARNING(url));
deferredPostMessage({
command: 'GET_HEADER',