From nobody Sat Mar 26 15:51:13 2022 X-Original-To: dev-commits-ports-branches@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 976DD1A456D2; Sat, 26 Mar 2022 15:51:13 +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 4KQk2n3qQ7z3thX; Sat, 26 Mar 2022 15:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648309873; 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=oRl2Ir4p3J/sFPX+oi/PpzJn51GzMeiBn4huJ4xsasI=; b=meCpogkZZpcSZZ0ofFln8YDxeuy3XaM8cH1VlQAqV45bhM/HIjH6Rc7OJT896JCbAEkoQu 5qMAexGHIzkONGheXqfUKLC2fwSTTKPuBvPIu0fPq7yghfBvx1Z5izHsKu/Alx99GCayco d/guAfWjS4mfkkNwBHIQOzT0hAXSr0jsIYNiLfseWSJLb1ALRk3B3dOa5/VUFXu3ajrIog D3W/dmHZL+xAl3vYUXdZqKkqSzHrc7xN8YJKMM25+pqRPwP1fodaFPfDPXGEZSSfLiEdD6 DmvX/qVg3HTaXxVu85TvHrltJ/00zNJF0V03JKlGYQ8MyOogO9WCqwaRfjdx6Q== 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 655D123C58; Sat, 26 Mar 2022 15:51:13 +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 22QFpDlO048553; Sat, 26 Mar 2022 15:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22QFpD23048552; Sat, 26 Mar 2022 15:51:13 GMT (envelope-from git) Date: Sat, 26 Mar 2022 15:51:13 GMT Message-Id: <202203261551.22QFpD23048552@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ashish SHUKLA Subject: git: 82c90ab7afce - 2022Q1 - net-im/py-matrix-synapse: Fix rc.d script List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 82c90ab7afce7accb3f502e4587a46f76642c74b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648309873; 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=oRl2Ir4p3J/sFPX+oi/PpzJn51GzMeiBn4huJ4xsasI=; b=Y+E540pxlOscsLnGJewqtaU2arXbCKnYJxXG4oEP40xfC4Kmt6QAo2aESK40ZJ/f99ABq5 40jhWQAZiri1ko5PBnq78+HWz1bqADYUQojo/rdlxJWFaZD1HiDTzVEAkiKhZeQHj9aGtY BRdUKQlaw3+T34ZiZGtsSWvNMGi9wgxTvgzrraG92iZbARYKGFEe8g6VY0fedNPernFSo3 LmZk3CseYaRujfXVQv+KY7QksWTT3ELoTtw01RWPxrngCoq/dG6tRKFgyqE2f6hxODTxXc d01xnwwj+J04CjIYI7oOtyOb18ahURGRCR9/dxFQOIucc2AXFuKcManVIYzKcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648309873; a=rsa-sha256; cv=none; b=NVdZe3OgJG+uNMsovt4wkWw4IAfhkqG1vxhXRtcD634JSZt3AUZFOVeRN1fwTPQwPgW5Y2 bG7Pkl9VCgFVkqFO+R/CBkDak4YGo/49j5DVClZLMeqwqyNgXmqfRT5dLxRdB9P4STCtnh cs1nZgEyQmZKz4B5kyt/1Yu8UkZFjUX7AJJQ2/KPtgnDo+LjZMXljRHDA5lep9hWdcLm23 t4uOvf7KPM28/posNVZcc2Zb61y9zHx2IuIsdWh/QBPjOguBrzIjzrj3gltoR6LEsvVw+L HHZdqnDYGgLl587G331VcPFiX6LIjTPgsLdO6Elhpiww9v8dd/409qiGPbKF7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=82c90ab7afce7accb3f502e4587a46f76642c74b commit 82c90ab7afce7accb3f502e4587a46f76642c74b Author: Sascha Biberhofer AuthorDate: 2022-03-26 12:49:11 +0000 Commit: Ashish SHUKLA CommitDate: 2022-03-26 15:48:41 +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 (cherry picked from commit 6e79c8a26861c23f9604b926d80f86412139bde0) --- 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 }