efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

matrix - refactor venv- usage and directory name

Browse Source
This commit is contained in:
Martin Winkler
2022-12-22 11:50:14 +01:00
parent 511b6145bb
commit 5863cccc86
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
seqs/matrix.sh
View File

@@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
readonly toolName=synapse 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 toolDeps+=" jq" # used as helper for api access
readonly toolDepsRaspi="libopenjp2-7 libtiff5" toolDepsRaspi="libopenjp2-7 libtiff5"
readonly toolUser="synapse" readonly toolUser="synapse"
readonly toolGroup="synapse" readonly toolGroup="synapse"
readonly toolServiceName="matrix-synapse" readonly toolServiceName="matrix-synapse"
readonly synapseHashTool="env/bin/hash_password" readonly synapseHashTool="venv/bin/hash_password"
readonly toolUrlLocal="http://localhost:8008" readonly toolUrlLocal="http://localhost:8008"
# Filled by configuration # Filled by configuration
toolConfig= toolConfig=
@@ -88,10 +88,10 @@ step_4_info() { echo "Install $toolName"; }
step_4_alias() { echo "virtualenv"; } step_4_alias() { echo "virtualenv"; }
step_4() { step_4() {
exe mkdir -p "$MATRIX_HOME" exe mkdir -p "$MATRIX_HOME"
exe virtualenv -p python3 "${MATRIX_HOME}/env" exe python3 -m venv "${MATRIX_HOME}/venv"
exe cd "$MATRIX_HOME" exe cd "$MATRIX_HOME"
disableErrorCheck disableErrorCheck
exe source "${MATRIX_HOME}/env/bin/activate" exe source "${MATRIX_HOME}/venv/bin/activate"
enableErrorCheck enableErrorCheck
exe pip install --upgrade pip exe pip install --upgrade pip
exe pip install --upgrade setuptools exe pip install --upgrade setuptools
@@ -138,9 +138,9 @@ After=network.target postgresql.service
[Service] [Service]
Type=forking Type=forking
WorkingDirectory=\${MATRIX_HOME}/ WorkingDirectory=\${MATRIX_HOME}/
ExecStart=\${MATRIX_HOME}/env/bin/synctl start ExecStart=\${MATRIX_HOME}/venv/bin/synctl start
ExecStop=\${MATRIX_HOME}/env/bin/synctl stop ExecStop=\${MATRIX_HOME}/venv/bin/synctl stop
ExecReload=\${MATRIX_HOME}/env/bin/synctl restart ExecReload=\${MATRIX_HOME}/venv/bin/synctl restart
User=\${toolUser} User=\${toolUser}
Group=\${toolGroup} Group=\${toolGroup}
Restart=always Restart=always
@@ -167,7 +167,7 @@ step_10() {
fi fi
info "Upgrading $toolName" info "Upgrading $toolName"
disableErrorCheck disableErrorCheck
exe source "${MATRIX_HOME}/env/bin/activate" exe source "${MATRIX_HOME}/venv/bin/activate"
exe pip install --upgrade pip exe pip install --upgrade pip
exe pip install --upgrade matrix-synapse exe pip install --upgrade matrix-synapse
saveReturn $? saveReturn $?
@@ -239,7 +239,7 @@ step_16() {
step_18_info() { echo "Create new user"; } step_18_info() { echo "Create new user"; }
step_18_alias() { echo "adduser"; } step_18_alias() { echo "adduser"; }
step_18() { 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() { step_20_info() {
@@ -502,9 +502,9 @@ step_56() {
# Backup database # Backup database
./postgres.sh backupdb synapse ./postgres.sh backupdb synapse
# Backup virtual env folders except "env" # Backup virtual venv folders except "venv"
cd ${MATRIX_HOME} 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 # Transfer both backup files to target server