From 82c90ab7afce7accb3f502e4587a46f76642c74b Mon Sep 17 00:00:00 2001 From: Sascha Biberhofer Date: Sat, 26 Mar 2022 12:49:11 +0000 Subject: 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 } -- cgit v1.2.3