diff --git a/seqs/matrix.sh b/seqs/matrix.sh index 38cf422..c1d7c7a 100755 --- a/seqs/matrix.sh +++ b/seqs/matrix.sh @@ -1,13 +1,13 @@ #!/bin/bash readonly toolName=synapse -toolDeps="build-essential python3-dev libffi-dev python3-pip python3-setuptools postgresql libssl-dev virtualenv libjpeg-dev libxslt1-dev libpq5 libpq-dev" +toolDeps="build-essential python3-dev libffi-dev python3-pip python3-venv python3-setuptools postgresql libssl-dev libjpeg-dev libxslt1-dev libpq5 libpq-dev" readonly toolDeps+=" jq" # used as helper for api access -readonly toolDepsRaspi="libopenjp2-7 libtiff5" +toolDepsRaspi="libopenjp2-7 libtiff5" readonly toolUser="synapse" readonly toolGroup="synapse" readonly toolServiceName="matrix-synapse" -readonly synapseHashTool="env/bin/hash_password" +readonly synapseHashTool="venv/bin/hash_password" readonly toolUrlLocal="http://localhost:8008" # Filled by configuration toolConfig= @@ -88,10 +88,10 @@ step_4_info() { echo "Install $toolName"; } step_4_alias() { echo "virtualenv"; } step_4() { exe mkdir -p "$MATRIX_HOME" - exe virtualenv -p python3 "${MATRIX_HOME}/env" + exe python3 -m venv "${MATRIX_HOME}/venv" exe cd "$MATRIX_HOME" disableErrorCheck - exe source "${MATRIX_HOME}/env/bin/activate" + exe source "${MATRIX_HOME}/venv/bin/activate" enableErrorCheck exe pip install --upgrade pip exe pip install --upgrade setuptools @@ -138,9 +138,9 @@ After=network.target postgresql.service [Service] Type=forking WorkingDirectory=\${MATRIX_HOME}/ -ExecStart=\${MATRIX_HOME}/env/bin/synctl start -ExecStop=\${MATRIX_HOME}/env/bin/synctl stop -ExecReload=\${MATRIX_HOME}/env/bin/synctl restart +ExecStart=\${MATRIX_HOME}/venv/bin/synctl start +ExecStop=\${MATRIX_HOME}/venv/bin/synctl stop +ExecReload=\${MATRIX_HOME}/venv/bin/synctl restart User=\${toolUser} Group=\${toolGroup} Restart=always @@ -167,7 +167,7 @@ step_10() { fi info "Upgrading $toolName" disableErrorCheck - exe source "${MATRIX_HOME}/env/bin/activate" + exe source "${MATRIX_HOME}/venv/bin/activate" exe pip install --upgrade pip exe pip install --upgrade matrix-synapse saveReturn $? @@ -239,7 +239,7 @@ step_16() { step_18_info() { echo "Create new user"; } step_18_alias() { echo "adduser"; } step_18() { - exe /opt/synapse/env/bin/register_new_matrix_user -c "$MATRIX_HOME/homeserver.yaml" $toolUrlLocal + exe /opt/synapse/venv/bin/register_new_matrix_user -c "$MATRIX_HOME/homeserver.yaml" $toolUrlLocal } step_20_info() { @@ -502,9 +502,9 @@ step_56() { # Backup database ./postgres.sh backupdb synapse -# Backup virtual env folders except "env" +# Backup virtual venv folders except "venv" cd ${MATRIX_HOME} - tar czf ../\$(date +%Y-%m-%d"_"%H-%M-%S).synapse_bu.tar.gz --exclude="./env" . + tar czf ../\$(date +%Y-%m-%d"_"%H-%M-%S).synapse_bu.tar.gz --exclude="./venv" . # Transfer both backup files to target server