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

Federation onion port not needed

parent f9e1dccb
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,6 @@ MATRIX_CODE=
MATRIX_DATA_DIR='/var/lib/matrix'
MATRIX_HTTP_PORT=8448
MATRIX_PORT=8009
MATRIX_FEDERATION_ONION_PORT=8111
MATRIX_ONION_PORT=8109
MATRIX_REPO="https://github.com/matrix-org/synapse"
MATRIX_COMMIT='907e6da5be20523bd1d0a14c196289a73182aa65'
......@@ -202,28 +201,6 @@ function matrix_nginx {
echo -n '' > $matrix_nginx_site
fi
{ echo 'server {';
echo " listen 127.0.0.1:$MATRIX_FEDERATION_ONION_PORT default_server;";
echo ' port_in_redirect off;';
echo " server_name $MATRIX_DOMAIN_NAME;";
echo ''; } >> $matrix_nginx_site
function_check nginx_security_options
nginx_security_options $MATRIX_DOMAIN_NAME
{ echo '';
echo ' # Logs';
echo ' access_log /dev/null;';
echo ' error_log /dev/null;';
echo '';
echo ' root /var/lib/matrix/media_store;';
echo '';
echo ' # Location';
echo ' location /_matrix {'; } >> $matrix_nginx_site
function_check nginx_limits
nginx_limits ${MATRIX_DOMAIN_NAME} '15m'
{ echo " proxy_pass http://localhost:${MATRIX_PORT};";
echo ' }';
echo '}';
echo '';
echo 'server {';
echo " listen 127.0.0.1:$MATRIX_ONION_PORT default_server;";
echo ' port_in_redirect off;';
echo " server_name $MATRIX_DOMAIN_NAME;";
......@@ -588,7 +565,6 @@ function remove_matrix {
userdel -r matrix
remove_onion_service matrix ${MATRIX_ONION_PORT}
remove_onion_service matrix ${MATRIX_FEDERATION_ONION_PORT}
#sed -i "/# Matrix Server/,/# End of Matrix Server/d" /etc/nginx/sites-available/${MATRIX_DOMAIN_NAME}
systemctl restart nginx
......@@ -696,10 +672,7 @@ function install_home_server {
cd "$MATRIX_DATA_DIR" || exit 365856835
sqlite3 homeserver.db "PRAGMA auto_vacuum = FULL;"
#MATRIX_ONION_HOSTNAME=$(add_onion_service matrix ${MATRIX_PORT} ${MATRIX_ONION_PORT})
add_onion_service matrix 80 ${MATRIX_ONION_PORT}
echo "HiddenServicePort ${MATRIX_HTTP_PORT} 127.0.0.1:${MATRIX_FEDERATION_ONION_PORT}" >> "$ONION_SERVICES_FILE"
systemctl restart tor
MATRIX_ONION_HOSTNAME=$(add_onion_service matrix 80 ${MATRIX_ONION_PORT})
if [ ! "${MATRIX_PASSWORD}" ]; then
if [ -f "${IMAGE_PASSWORD_FILE}" ]; then
......
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