Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Mar 2022 15:51:13 GMT
From:      Ashish SHUKLA <ashish@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 82c90ab7afce - 2022Q1 - net-im/py-matrix-synapse: Fix rc.d script
Message-ID:  <202203261551.22QFpD23048552@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=82c90ab7afce7accb3f502e4587a46f76642c74b

commit 82c90ab7afce7accb3f502e4587a46f76642c74b
Author:     Sascha Biberhofer <ports@skyforge.at>
AuthorDate: 2022-03-26 12:49:11 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
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 <mg at fork dot pl>
    
    (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
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203261551.22QFpD23048552>