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

Update matrix connection rate limits

parent 0b2d56dd
No related branches found
No related tags found
No related merge requests found
...@@ -221,12 +221,15 @@ function matrix_nginx { ...@@ -221,12 +221,15 @@ function matrix_nginx {
nginx_limits ${MATRIX_DOMAIN_NAME} '15m' nginx_limits ${MATRIX_DOMAIN_NAME} '15m'
{ echo " proxy_pass http://localhost:${MATRIX_PORT};"; { echo " proxy_pass http://localhost:${MATRIX_PORT};";
echo ' }'; echo ' }';
echo '}'; } >> $matrix_nginx_site echo '}'; } >> "$matrix_nginx_site"
if [ ! -d /var/www/$MATRIX_DOMAIN_NAME ]; then if [ ! -d "/var/www/$MATRIX_DOMAIN_NAME" ]; then
mkdir -p /var/www/$MATRIX_DOMAIN_NAME/htdocs mkdir -p "/var/www/$MATRIX_DOMAIN_NAME/htdocs"
fi fi
sed -i 's|limit_conn conn_limit_per_ip.*|limit_conn conn_limit_per_ip 50;|g' "$matrix_nginx_site"
sed -i 's|limit_req zone.*|limit_req zone=req_limit_per_ip burst=50 nodelay;|g' "$matrix_nginx_site"
function_check add_ddns_domain function_check add_ddns_domain
add_ddns_domain $MATRIX_DOMAIN_NAME add_ddns_domain $MATRIX_DOMAIN_NAME
} }
...@@ -412,6 +415,16 @@ function upgrade_matrix { ...@@ -412,6 +415,16 @@ function upgrade_matrix {
return return
fi fi
# update connection rate limits
read_config_param MATRIX_DOMAIN_NAME
matrix_nginx_site=/etc/nginx/sites-available/$MATRIX_DOMAIN_NAME
if ! grep -q 'req_limit_per_ip burst=50 ' "$matrix_nginx_site"; then
sed -i 's|limit_req zone.*|limit_req zone=req_limit_per_ip burst=50 nodelay;|g' "$matrix_nginx_site"
fi
if ! grep -q 'conn_limit_per_ip 50;' "$matrix_nginx_site"; then
sed -i 's|limit_conn conn_limit_per_ip.*|limit_conn conn_limit_per_ip 50;|g' "$matrix_nginx_site"
fi
matrix_expire_old_posts matrix_expire_old_posts
CURR_MATRIX_COMMIT=$(get_completion_param "matrix commit") CURR_MATRIX_COMMIT=$(get_completion_param "matrix commit")
......
...@@ -168,9 +168,10 @@ function upgrade_riot { ...@@ -168,9 +168,10 @@ function upgrade_riot {
return return
fi fi
# update connection rate limits
read_config_param RIOT_DOMAIN_NAME read_config_param RIOT_DOMAIN_NAME
riot_nginx_site=/etc/nginx/sites-available/$RIOT_DOMAIN_NAME riot_nginx_site=/etc/nginx/sites-available/$RIOT_DOMAIN_NAME
if ! grep -q 'req_limit_per_ip burst=50' "$riot_nginx_site"; then if ! grep -q 'req_limit_per_ip burst=50 ' "$riot_nginx_site"; then
sed -i 's|limit_req zone.*|limit_req zone=req_limit_per_ip burst=50 nodelay;|g' "$riot_nginx_site" sed -i 's|limit_req zone.*|limit_req zone=req_limit_per_ip burst=50 nodelay;|g' "$riot_nginx_site"
fi fi
......
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