Date: Wed, 13 Nov 2024 11:57:23 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 29abb996b472 - main - www/onlyoffice-documentserver: Various fixes Message-ID: <202411131157.4ADBvNvD095800@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=29abb996b4728af244f46a187d834c7154f736bc commit 29abb996b4728af244f46a187d834c7154f736bc Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2024-11-13 11:52:01 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2024-11-13 11:57:17 +0000 www/onlyoffice-documentserver: Various fixes - Fix nginx ds-cache.conf location in documentserver-flush-cache.sh - Fix sed invocation in documentserver-flush-cache.sh - Remove extra whitespace in documentserver-generate-allfonts.sh - Remove todo list in Makefile PR: 282724 --- www/onlyoffice-documentserver/Makefile | 7 +------ ...common_documentserver_bin_documentserver-flush-cache.sh.m4 | 5 +++-- ..._documentserver_bin_documentserver-generate-allfonts.sh.m4 | 11 +++++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index bb1ea81874f2..ddbf63e93b4e 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -1,12 +1,7 @@ -# todo rm -# work/stage/usr/local/www/onlyoffice/documentserver/server/Common/config/production-freebsd.json.bak -# work/stage/usr/local/www/onlyoffice/documentserver/server/Common/config/development-freebsd.json.bak -# work/stage/usr/local/www/onlyoffice/documentserver/dictionaries/sl_SI/hyph_sl_SI.dic.bak - - PORTNAME= onlyoffice-documentserver DISTVERSIONPREFIX= v DISTVERSION= 8.2.0.143 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES+= LOCAL/mikael/v8/:source1 \ LOCAL/mikael/onlyoffice/:source2 \ diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 index d06f8d9b839e..9328f2d98079 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 @@ -5,13 +5,14 @@ # Save the hash to a variable in the configuration file -echo "set \$cache_tag \"$HASH\";" > /etc/nginx/includes/ds-cache.conf -+echo "set \$cache_tag \"$HASH\";" > %%LOCALBASE%%/etc/nginx/includes/ds-cache.conf ++echo "set \$cache_tag \"$HASH\";" > %%ETCDIR%%/etc/nginx/includes/ds-cache.conf -API_PATH="/var/www/M4_DS_PREFIX/web-apps/apps/api/documents/api.js" +API_PATH="%%LOCALBASE%%/www/M4_DS_PREFIX/web-apps/apps/api/documents/api.js" cp -f ${API_PATH}.tpl ${API_PATH} - sed -i "s/{{HASH_POSTFIX}}/${HASH}/g" ${API_PATH} +-sed -i "s/{{HASH_POSTFIX}}/${HASH}/g" ${API_PATH} -chown ds:ds ${API_PATH} ++sed -i '' "s/{{HASH_POSTFIX}}/${HASH}/g" ${API_PATH} +chown onlyoffice:onlyoffice ${API_PATH} rm -f ${API_PATH}.gz diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 index 6b4405573867..60005e0dd275 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 @@ -7,9 +7,9 @@ -DIR="/var/www/M4_DS_PREFIX" +DIR="%%LOCALBASE%%/www/M4_DS_PREFIX" - #Start generate AllFonts.js, font thumbnails and font_selection.bin - echo -n Generating AllFonts.js, please wait... -@@ -49,11 +49,6 @@ echo Done + export LD_LIBRARY_PATH=/var/www/M4_DS_PREFIX/server/FileConverter/bin:$LD_LIBRARY_PATH + +@@ -52,24 +52,16 @@ echo Done echo Done @@ -21,7 +21,10 @@ #Remove gzipped files rm -f \ $DIR/fonts/*.gz \ -@@ -62,10 +57,7 @@ if [ "$ONLYOFFICE_DATA_CONTAINER" != "true" ]; then + $DIR/sdkjs/common/AllFonts.js.gz \ +- $DIR/sdkjs/common/Images/*.gz \ ++ $DIR/sdkjs/common/Images/*.gz \ + $DIR/sdkjs/slide/themes/themes.js.gz #Restart web-site and converter if [ "$ONLYOFFICE_DATA_CONTAINER" != "true" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411131157.4ADBvNvD095800>