From nobody Sat Mar 26 15:45:00 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 DC8581A43E01; Sat, 26 Mar 2022 15:45:00 +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 4KQjvc38hMz3sqH; Sat, 26 Mar 2022 15:45:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648309500; 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=dbKstK85XLahIALutak7+/3Kr+6AF72+WX58svX/idc=; b=rwTXQnXj6n5r+kY+2sdypz2+x23NY4i4B9jQzu8odyR8gnRpakuf2TaE/AO3Bs+yePlDoW 1NxBEujYeCpYJiaqqsCjxoTUc9rAbiQ/juD2qOrmPNGtKlfCZMYkHZuJbW2KZPro/yoV8V W7ODhS+GSME8yeYUZ4d1vxrYSsDpqbyCzuw+/1guGoY4hmypmHGxXk+SC3n78wbQN+mdhp YHva0exIEccIiGecxurgHPghA4p527g0Ab0spewY9YHDimzwp14QmOXd1dU25/9AAmafng Sx+bgy+CAvjCYS27vb5emX6SJ4mH/2oFpQmJ+lQiFeEkFV0nAp5KxNDWnjHwkA== 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 17CC3239E5; Sat, 26 Mar 2022 15:45:00 +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 22QFj00Y035758; Sat, 26 Mar 2022 15:45:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22QFj0a3035757; Sat, 26 Mar 2022 15:45:00 GMT (envelope-from git) Date: Sat, 26 Mar 2022 15:45:00 GMT Message-Id: <202203261545.22QFj0a3035757@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 6e79c8a26861 - main - net-im/py-matrix-synapse: Fix rc.d script 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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e79c8a26861c23f9604b926d80f86412139bde0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648309500; 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=dbKstK85XLahIALutak7+/3Kr+6AF72+WX58svX/idc=; b=fgCgi/yKwOu2j0rWJ6hd7z5zU/VK/oEmL5VrWtuKe7ykp4b6MhPJUM/pMlniQLRk1PyOxN GkB2wtg+tC85wX6fO1f425TeI0WFZHcu1n4Cc4Ym4rVP/pjxgBm/IY1rHEivaWbPz8j2My zu1ECqk4RjTeSgr9VNHm+F3mPzIPJWxhPxKVFfI8gqc7j8y8xI7BfGsdgKUbZsD+1Lz2AZ 6wZdyvX/zpBrIxLEoTUjdondkr6R0czEyIG0GvX85Dc1kK9ntUQmtrdKGjfXQo6Q0ehZM5 VpHQ+1hu3tkMQzLFs0krQCB0lWIVKcLhvsvWcBwxGq0CmUTSRDhlQwdm0OoWfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648309500; a=rsa-sha256; cv=none; b=Sczh3ngdAgM26ulqnZLdpWdV6ABUkQDTv54MjEu3vTuuVVXSpfT38ZN9ylgi46fNzk8IW0 zWvNHfrNrKJF0LsKjfJX6KmF+cK1AxqfeJ2+3+7EoVUI4aD1N1OB54z/T3/SX8Fu6MTHDS 8OCvCIfsR+uYX3OE3KS4/2Wk5CHCRFLjIn7Y7Dn+7Bs438j3ZO+6wTRul9yRUNg0f7DXz3 NADxphyIDAKQdcZsxileHzbeGzN9AoGaY8Q3nMAY9ANEnr5GSR+iySpykYtNd4KoZTBsYO HtbYu/rd310SCTwEU8KCp6CDfsA8ygI6e4XtbqgJ4aU1YxarRMfXzlmcSPu0uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e79c8a26861c23f9604b926d80f86412139bde0 commit 6e79c8a26861c23f9604b926d80f86412139bde0 Author: Sascha Biberhofer AuthorDate: 2022-03-26 12:49:11 +0000 Commit: Ashish SHUKLA CommitDate: 2022-03-26 15:44:32 +0000 net-im/py-matrix-synapse: Fix rc.d script rc.d script doesn't use synapse_user variable in start_precmd PR: 262692 Reported by: Marcin Gryszkalis --- net-im/py-matrix-synapse/files/synapse.in | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/net-im/py-matrix-synapse/files/synapse.in b/net-im/py-matrix-synapse/files/synapse.in index c9cfe42e327a..b7dd4fa57eed 100644 --- a/net-im/py-matrix-synapse/files/synapse.in +++ b/net-im/py-matrix-synapse/files/synapse.in @@ -33,21 +33,15 @@ start_precmd=start_precmd start_precmd() { if [ ! -d ${synapse_pidfile%/*} ] ; then - install -d -o %%USERS%% -g wheel ${synapse_pidfile%/*}; + install -d -o ${synapse_user} -g wheel ${synapse_pidfile%/*}; fi if [ ! -d ${synapse_dbdir} ] ; then - install -d -o %%USERS%% -g wheel ${synapse_dbdir}; + install -d -o ${synapse_user} -g wheel ${synapse_dbdir}; fi if [ ! -d ${synapse_logdir} ] ; then - install -d -o %%USERS%% -g wheel ${synapse_logdir}; - fi - - if $(grep -q CHANGEME ${synapse_conf}) ; then - echo "Error: Default secret values in config." - echo "Please replace the CHANGEME values in ${synapse_conf}" - exit 1 + install -d -o ${synapse_user} -g wheel ${synapse_logdir}; fi }