Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
7123d4f7
Commit
7123d4f7
authored
7 years ago
by
Fred Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support increasing proxy_connect_timeout
parent
1a2715fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
playbooks/roles/nginx/defaults/main.yml
+7
-0
playbooks/roles/nginx/templates/edx/app/nginx/sites-available/cms.j2
+14
-0
No files found.
playbooks/roles/nginx/defaults/main.yml
View file @
7123d4f7
...
@@ -44,6 +44,13 @@ NGINX_LOG_FORMAT_NAME: 'p_combined'
...
@@ -44,6 +44,13 @@ NGINX_LOG_FORMAT_NAME: 'p_combined'
# headers to reflect the properties of the incoming request.
# headers to reflect the properties of the incoming request.
NGINX_SET_X_FORWARDED_HEADERS
:
False
NGINX_SET_X_FORWARDED_HEADERS
:
False
# Increasing these values allows studio to process more complex operations.
# Default timeouts limit CMS connections to 60 seconds.
NGINX_CMS_PROXY_CONNECT_TIMEOUT
:
!!null
NGINX_CMS_PROXY_SEND_TIMEOUT
:
!!null
NGINX_CMS_PROXY_READ_TIMEOUT
:
!!null
NGINX_SERVER_ERROR_IMG
:
'
https://upload.wikimedia.org/wikipedia/commons/thumb/1/11/Pendleton_Sinking_Ship.jpg/640px-Pendleton_Sinking_Ship.jpg'
NGINX_SERVER_ERROR_IMG
:
'
https://upload.wikimedia.org/wikipedia/commons/thumb/1/11/Pendleton_Sinking_Ship.jpg/640px-Pendleton_Sinking_Ship.jpg'
NGINX_SERVER_HTML_FILES
:
NGINX_SERVER_HTML_FILES
:
-
file
:
rate-limit.html
-
file
:
rate-limit.html
...
...
This diff is collapsed.
Click to expand it.
playbooks/roles/nginx/templates/edx/app/nginx/sites-available/cms.j2
View file @
7123d4f7
...
@@ -104,6 +104,20 @@ error_page {{ k }} {{ v }};
...
@@ -104,6 +104,20 @@ error_page {{ k }} {{ v }};
proxy_redirect off;
proxy_redirect off;
proxy_pass http://cms-backend;
proxy_pass http://cms-backend;
{{ NGINX_EDXAPP_CMS_APP_EXTRA }}
{% if NGINX_CMS_PROXY_CONNECT_TIMEOUT %}
proxy_connect_timeout {{ NGINX_CMS_PROXY_CONNECT_TIMEOUT }};
{% endif %}
{% if NGINX_CMS_PROXY_SEND_TIMEOUT %}
proxy_send_timeout {{ NGINX_CMS_PROXY_SEND_TIMEOUT }};
{% endif %}
{% if NGINX_CMS_PROXY_READ_TIMEOUT %}
proxy_read_timeout {{ NGINX_CMS_PROXY_READ_TIMEOUT }};
{% endif %}
{{ NGINX_EDXAPP_CMS_APP_EXTRA }}
}
}
location / {
location / {
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment