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
0b8835fa
Commit
0b8835fa
authored
May 07, 2014
by
Fred Smith
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1070 from edx/derf/studio-url-configurable
optionally override cms hostname in nginx
parents
f1416003
c2426f90
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
playbooks/roles/nginx/defaults/main.yml
+2
-0
playbooks/roles/nginx/templates/edx/app/nginx/sites-available/cms.j2
+1
-2
No files found.
playbooks/roles/nginx/defaults/main.yml
View file @
0b8835fa
...
@@ -29,6 +29,8 @@ nginx_debian_pkgs:
...
@@ -29,6 +29,8 @@ nginx_debian_pkgs:
-
nginx
-
nginx
-
python-passlib
-
python-passlib
CMS_HOSTNAME
:
'
~^((stage|prod)-)?studio\..*'
nginx_template_dir
:
"
edx/app/nginx/sites-available"
nginx_template_dir
:
"
edx/app/nginx/sites-available"
nginx_xserver_gunicorn_hosts
:
nginx_xserver_gunicorn_hosts
:
...
...
playbooks/roles/nginx/templates/edx/app/nginx/sites-available/cms.j2
View file @
0b8835fa
...
@@ -27,8 +27,7 @@ server {
...
@@ -27,8 +27,7 @@ server {
listen {{EDXAPP_CMS_NGINX_PORT}} {{default_site}};
listen {{EDXAPP_CMS_NGINX_PORT}} {{default_site}};
{% endif %}
{% endif %}
server_name {{ CMS_HOSTNAME }};
server_name ~^((stage|prod)-)?studio\..*;
access_log {{ nginx_log_dir }}/access.log;
access_log {{ nginx_log_dir }}/access.log;
error_log {{ nginx_log_dir }}/error.log error;
error_log {{ nginx_log_dir }}/error.log error;
...
...
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