From nobody Wed Jan 19 19:13:27 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CCE06196E01A; Wed, 19 Jan 2022 19:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JfFfb5QQrz4l2F; Wed, 19 Jan 2022 19:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642619607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C5NQU1KS1BTFvgISEwi4xuG+If+58HkTUYmZw7Vp9uk=; b=aAGAjweS9TTNKM5qHYitX5bAwbtpNOf4y28wfuiaHFawDp9JDGLrVPeC3dp2omwOsAK7Et dHaE1/067myFMhUsXVWGSZYC8Z/wpczIqxpAX2XdCUYK3xkvh0FPZFrFtdjmUSrXJ/4Rk0 Ce6lNzij0C1BxjA81rK2KJL2xn/eklX25bfvecwcoz36E2uZlYxkYrlXYT7IDzW1DuxDQ9 KyriyoojCiRTtcBByjywI0XyeF8ytZk8vrwCoD0SnG7fFLi5UgpOHEiR6hClM/V38pwKiL vi32VjjhM7RnEO5VTcoqxqcra6m9ba1irCjNgvCCKvYTFB8fhSMi6oFVJ1BKTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A4421A615; Wed, 19 Jan 2022 19:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20JJDRCH097890; Wed, 19 Jan 2022 19:13:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JJDRJ2097889; Wed, 19 Jan 2022 19:13:27 GMT (envelope-from git) Date: Wed, 19 Jan 2022 19:13:27 GMT Message-Id: <202201191913.20JJDRJ2097889@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 54d51fc31926 - main - www/onlyoffice-documentserver: Fix onlyoffice username List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54d51fc319266a111075953b1998f1d1f9e19eab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642619607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C5NQU1KS1BTFvgISEwi4xuG+If+58HkTUYmZw7Vp9uk=; b=wGNHU7ZpP8dhumTHHWmuUeCcgiNMjHWBQ4cmAdXKt53tiWcs/nazCdBconYriDXmou4DnE ULNBHqbvkJqT1flM6dIxj+lPztAUwkF1TQVvNTjzFG877iJdzl0f8Pf91PMu3HjBck+xNi oYPApT3ApBQcsxmGYnKDjWHjyKzRVlbRuaFEVBFQBc9X3G+YERExJcq5WIAu590oYcUEwt 6sa/4E4rOGgB87phad+2JfIotAXZcoQov3aL4Lh9X3e42cmaTrWQBDZNSyE41zRwFezSAP qF7DFhqTq0WGDKlT4fpMk+0GGb7BzyYXa4vM9Lsf3szQlK3PqF2RCgVgVl8P2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642619607; a=rsa-sha256; cv=none; b=OwRBu+CXxb7hpwJNv139cyoBCYojRzDc4W/2Hw0jGrDLaRHzMBTvLhMmcwXlRDPYykjfCZ W8TP9Ii4i5Nab4nxGob9aek6vlFkioEUptdvzYzemlyRtgrxfvB3Y4GWBiXGRwA8FKOK2H MSFwjEde2spal784A5AdeYzSLkPzEXh0YOuSpIvdythcKF3lrRY6B8lP3ptrXXXroIcIFI Oksd4HG1UcqiyTd3+dfnzqGBsugCHf1JOcxjRKWFhIqpZFeY9yy0/pyJPo0ZfIzN+tRe6+ NAwl0fGnp9YeP2etEmmT1Ej3Ma+U2oaDPO350LPpxLjmZ/zyFnhIg+09qTQ30g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=54d51fc319266a111075953b1998f1d1f9e19eab commit 54d51fc319266a111075953b1998f1d1f9e19eab Author: Mikael Urankar AuthorDate: 2022-01-19 19:12:05 +0000 Commit: Mikael Urankar 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*