From e16a537f53e0997df047c819276abf3cb984b7cd Mon Sep 17 00:00:00 2001 From: Evilham Date: Tue, 14 Mar 2023 10:32:16 +0100 Subject: [PATCH] [NC] Disable ownpad app as requested by schools --- dd-apps/docker/nextcloud/nc-setup.sh | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/dd-apps/docker/nextcloud/nc-setup.sh b/dd-apps/docker/nextcloud/nc-setup.sh index 7ea1356..e5674de 100755 --- a/dd-apps/docker/nextcloud/nc-setup.sh +++ b/dd-apps/docker/nextcloud/nc-setup.sh @@ -59,8 +59,8 @@ occupgrade # These cannot be edited from outside of the DD project # Operators should instead rely on the environment variables to ease deployment # EXTRA_PLUGINS_ENABLE and EXTRA_PLUGINS_DISABLE -CORE_PLUGINS_ENABLE="user_saml,bruteforcesettings,polls,calendar,spreed,bbb,mail,ownpad,onlyoffice" -CORE_PLUGINS_DISABLE="firstrunwizard,recommendations,dashboard,circles" +CORE_PLUGINS_ENABLE="user_saml,bruteforcesettings,polls,calendar,spreed,bbb,mail,onlyoffice" +CORE_PLUGINS_DISABLE="firstrunwizard,recommendations,dashboard,circles,ownpad" if [ "${DISABLE_CLAMAV:-true}" = "false" ]; then CORE_PLUGINS_ENABLE="${CORE_PLUGINS_ENABLE},files_antivirus" @@ -173,27 +173,8 @@ sed -i.orig \ -e 's/\(^\s*"Let.s go!" : [^¡]*\)¡\?\([^!]*\)!\(.*\)$/\1\2\3/' \ /var/www/html/custom_apps/bbb/l10n/*.json -# Patches / fixes for Ownpad -## Fix mimetypemapping for ownpad -MIMETYPEMAPPINGJSON="/var/www/html/config/mimetypemapping.json" -if ! grep -q "application/x-ownpad" "${MIMETYPEMAPPINGJSON}"; then - jq '. + {"pad": ["application/x-ownpad"], "calc": ["application/x-ownpad"]}' \ - /var/www/html/resources/config/mimetypemapping.dist.json > "${MIMETYPEMAPPINGJSON}" - # We have to tell NC about this change as documented here: - # https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#maintenance-commands - ./occ maintenance:mimetype:update-db -fi -## Open pads on new tab/window -OWNPADJS="/var/www/html/custom_apps/ownpad/js/ownpad.js" -if ! grep -q viewerDD "${OWNPADJS}"; then - ## TODO: Upstream this as a toggeable setting - sed -i.orig 's/^\(\s*\)var viewer = \(OC.generateUrl.*\)/\1var viewerDD = \2; window.open(viewerDD); return;/' "${OWNPADJS}" -fi - # Settings echo "--> Applying custom settings" -./occ --no-warnings config:app:set -n ownpad ownpad_etherpad_enable --value="yes" -./occ --no-warnings config:app:set -n ownpad ownpad_etherpad_host --value="https://pad.$DOMAIN" ./occ --no-warnings config:app:set -n onlyoffice DocumentServerUrl --value="https://oof.$DOMAIN" ./occ --no-warnings config:app:set -n onlyoffice jwt_secret --value="secret"