Date: Wed, 19 Jan 2022 19:13:27 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: 54d51fc31926 - main - www/onlyoffice-documentserver: Fix onlyoffice username Message-ID: <202201191913.20JJDRJ2097889@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=54d51fc319266a111075953b1998f1d1f9e19eab commit 54d51fc319266a111075953b1998f1d1f9e19eab Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2022-01-19 19:12:05 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2022-01-19 19:13:24 +0000 www/onlyoffice-documentserver: Fix onlyoffice username It's "onlyoffice" not "ds" While here remove a trailing whitespace in pkg-plist --- www/onlyoffice-documentserver/Makefile | 1 + ...kage_common_documentserver_supervisor_ds-converter.conf.m4 | 11 +++++++++++ ...age_common_documentserver_supervisor_ds-docservice.conf.m4 | 11 +++++++++++ ...ackage_common_documentserver_supervisor_ds-metrics.conf.m4 | 11 +++++++++++ www/onlyoffice-documentserver/pkg-plist | 2 +- 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index 08d90cf0f0af..7130882019b7 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -1,6 +1,7 @@ PORTNAME= onlyoffice-documentserver DISTVERSIONPREFIX= v DISTVERSION= 6.4.2 +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_supervisor_ds-converter.conf.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-converter.conf.m4 new file mode 100644 index 000000000000..63f0261b4317 --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-converter.conf.m4 @@ -0,0 +1,11 @@ +--- document-server-package/common/documentserver/supervisor/ds-converter.conf.m4.orig 2022-01-19 20:00:55 UTC ++++ document-server-package/common/documentserver/supervisor/ds-converter.conf.m4 +@@ -1,7 +1,7 @@ + [program:converter] + command=/var/www/M4_DS_PREFIX/server/FileConverter/converter + directory=/var/www/M4_DS_PREFIX/server/FileConverter +-user=ds ++user=onlyoffice + environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/M4_DS_PREFIX,NODE_DISABLE_COLORS=1,APPLICATION_NAME=M4_COMPANY_NAME + stdout_logfile=/var/log/M4_DS_PREFIX/converter/out.log + stdout_logfile_backups=0 diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-docservice.conf.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-docservice.conf.m4 new file mode 100644 index 000000000000..fa129f8b26ea --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-docservice.conf.m4 @@ -0,0 +1,11 @@ +--- document-server-package/common/documentserver/supervisor/ds-docservice.conf.m4.orig 2022-01-19 20:01:10 UTC ++++ document-server-package/common/documentserver/supervisor/ds-docservice.conf.m4 +@@ -1,7 +1,7 @@ + [program:docservice] + command=/var/www/M4_DS_PREFIX/server/DocService/docservice + directory=/var/www/M4_DS_PREFIX/server/DocService +-user=ds ++user=onlyoffice + environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/M4_DS_PREFIX,NODE_DISABLE_COLORS=1 + stdout_logfile=/var/log/M4_DS_PREFIX/docservice/out.log + stdout_logfile_backups=0 diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-metrics.conf.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-metrics.conf.m4 new file mode 100644 index 000000000000..a2837d4d4a6a --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_supervisor_ds-metrics.conf.m4 @@ -0,0 +1,11 @@ +--- document-server-package/common/documentserver/supervisor/ds-metrics.conf.m4.orig 2022-01-19 20:01:21 UTC ++++ document-server-package/common/documentserver/supervisor/ds-metrics.conf.m4 +@@ -1,7 +1,7 @@ + [program:metrics] + command=/var/www/M4_DS_PREFIX/server/Metrics/metrics ./config/config.js + directory=/var/www/M4_DS_PREFIX/server/Metrics +-user=ds ++user=onlyoffice + environment=NODE_DISABLE_COLORS=1 + stdout_logfile=/var/log/M4_DS_PREFIX/metrics/out.log + stdout_logfile_backups=0 diff --git a/www/onlyoffice-documentserver/pkg-plist b/www/onlyoffice-documentserver/pkg-plist index 30432d4794ea..9154e263bc52 100644 --- a/www/onlyoffice-documentserver/pkg-plist +++ b/www/onlyoffice-documentserver/pkg-plist @@ -22614,7 +22614,7 @@ lib/libkernel.so @dir %%WWWDIR%%/Data @dir %%WWWDIR%%/documentserver/fonts @postexec chown -R %%DS_USERNAME%%:%%DS_GROUPNAME%% /var/db/onlyoffice/documentserver -@postexec chown -R %%DS_USERNAME%%:%%DS_GROUPNAME%% /var/log/onlyoffice/documentserver +@postexec chown -R %%DS_USERNAME%%:%%DS_GROUPNAME%% /var/log/onlyoffice/documentserver @postexec chown -R %%DS_USERNAME%%:%%DS_GROUPNAME%% %D/%%WWWDIR%%/documentserver @postunexec rm -rf %D/%%WWWDIR%%/documentserver/fonts @postunexec rm -rf %D/%%WWWDIR%%/documentserver/sdkjs/slide/themes/theme*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201191913.20JJDRJ2097889>