Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
0bc08bb0
Commit
0bc08bb0
authored
6 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Update matrix connection rate limits
parent
0b2d56dd
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/freedombone-app-matrix
+16
-3
16 additions, 3 deletions
src/freedombone-app-matrix
src/freedombone-app-riot
+2
-1
2 additions, 1 deletion
src/freedombone-app-riot
with
18 additions
and
4 deletions
src/freedombone-app-matrix
+
16
−
3
View file @
0bc08bb0
...
...
@@ -221,12 +221,15 @@ function matrix_nginx {
nginx_limits
${
MATRIX_DOMAIN_NAME
}
'15m'
{
echo
" proxy_pass http://localhost:
${
MATRIX_PORT
}
;"
;
echo
' }'
;
echo
'}'
;
}
>>
$matrix_nginx_site
echo
'}'
;
}
>>
"
$matrix_nginx_site
"
if
[
!
-d
/var/www/
$MATRIX_DOMAIN_NAME
]
;
then
mkdir
-p
/var/www/
$MATRIX_DOMAIN_NAME
/htdocs
if
[
!
-d
"
/var/www/
$MATRIX_DOMAIN_NAME
"
]
;
then
mkdir
-p
"
/var/www/
$MATRIX_DOMAIN_NAME
/htdocs
"
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
add_ddns_domain
$MATRIX_DOMAIN_NAME
}
...
...
@@ -412,6 +415,16 @@ function upgrade_matrix {
return
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
CURR_MATRIX_COMMIT
=
$(
get_completion_param
"matrix commit"
)
...
...
This diff is collapsed.
Click to expand it.
src/freedombone-app-riot
+
2
−
1
View file @
0bc08bb0
...
...
@@ -168,9 +168,10 @@ function upgrade_riot {
return
fi
# update connection rate limits
read_config_param 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
"
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment