Skip to content
Snippets Groups Projects
Commit 079e3018 authored by Bob Mottram's avatar Bob Mottram
Browse files

Upgrade log configuration

parent f99d3178
No related branches found
No related tags found
No related merge requests found
......@@ -551,6 +551,18 @@ function upgrade_matrix {
# shellcheck disable=SC2230
MATRIX_PIP=$(which pip3)
if [[ "$ONION_ONLY" == 'no' ]]; then
if ! grep -q 'encoding: utf8' "$MATRIX_DATA_DIR/matrix.${MATRIX_DOMAIN_NAME}.log.config"; then
sed -i '/filters:/a encoding: utf8' "$MATRIX_DATA_DIR/matrix.${MATRIX_DOMAIN_NAME}.log.config"
sed -i 's|encoding: utf8| encoding: utf8|g' "$MATRIX_DATA_DIR/matrix.${MATRIX_DOMAIN_NAME}.log.config"
fi
else
if ! grep -q 'encoding: utf8' "$MATRIX_DATA_DIR/matrix.${MATRIX_ONION_HOSTNAME}.log.config"; then
sed -i '/filters:/a encoding: utf8' "$MATRIX_DATA_DIR/matrix.${MATRIX_ONION_HOSTNAME}.log.config"
sed -i 's|encoding: utf8| encoding: utf8|g' "$MATRIX_DATA_DIR/matrix.${MATRIX_ONION_HOSTNAME}.log.config"
fi
fi
fi
fi
......@@ -573,6 +585,16 @@ function upgrade_matrix {
$MATRIX_PIP install --upgrade --force "phonenumbers>=8.2.0"
$MATRIX_PIP install --upgrade --force "sortedcontainers>=2.0.4"
$MATRIX_PIP install --upgrade --force "prometheus_client>=0.3.0"
$MATRIX_PIP install --upgrade --force "daemonize>=2.3.1"
$MATRIX_PIP install --upgrade --force "pymacaroons-pynacl>=0.9.3"
$MATRIX_PIP install --upgrade --force "Twisted>=17.1.0"
$MATRIX_PIP install --upgrade --force "msgpack-python>=0.4.2"
$MATRIX_PIP install --upgrade --force "unpaddedbase64>=1.1.0"
$MATRIX_PIP install --upgrade --force "netaddr>=0.7.18"
$MATRIX_PIP install --upgrade --force "signedjson>=1.0.0"
$MATRIX_PIP install --upgrade --force "pysaml2>=3.0.0"
$MATRIX_PIP install --upgrade --force "signedjson>=1.0.0"
$MATRIX_PIP install --upgrade --force "psutil>=2.0.0"
if [ -f /etc/ssl/certs/${MATRIX_DOMAIN_NAME}.dhparam ]; then
chmod 755 /etc/ssl/certs/${MATRIX_DOMAIN_NAME}.dhparam
......@@ -968,6 +990,40 @@ function install_matrix {
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "daemonize>=2.3.1"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "pymacaroons-pynacl>=0.9.3"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "Twisted>=17.1.0"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "msgpack-python>=0.4.2"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "unpaddedbase64>=1.1.0"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "netaddr>=0.7.18"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "pysaml2>=3.0.0"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "signedjson>=1.0.0"
increment_app_install_progress
$MATRIX_PIP install --upgrade --force "psutil>=2.0.0"
function_check create_matrix_nginx_config
create_matrix_nginx_config
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment