Commit d3a373d5 by John Jarvis

adding more basic auth vars

parent 06e04092
DISCERN_NGINX_PORT: 18070 DISCERN_NGINX_PORT: 18070
DISCERN_BASIC_AUTH: False
discern_source_repo: https://github.com/edx/discern.git discern_source_repo: https://github.com/edx/discern.git
ease_source_repo: https://github.com/edx/ease.git ease_source_repo: https://github.com/edx/ease.git
......
...@@ -20,6 +20,9 @@ server { ...@@ -20,6 +20,9 @@ server {
} }
location / { location / {
{% if DISCERN_BASIC_AUTH %}
{% include "basic-auth.j2" %}
{% endif %}
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
proxy_set_header X-Forwarded-Port $http_x_forwarded_port; proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
proxy_set_header X-Forwarded-For $http_x_forwarded_for; proxy_set_header X-Forwarded-For $http_x_forwarded_for;
......
...@@ -8,6 +8,9 @@ server { ...@@ -8,6 +8,9 @@ server {
location / { location / {
{% if ORA_BASIC_AUTH %}
{% include "basic-auth.j2" %}
{% endif %}
try_files $uri @proxy_to_app; try_files $uri @proxy_to_app;
} }
......
...@@ -7,6 +7,9 @@ server { ...@@ -7,6 +7,9 @@ server {
listen {{ XQUEUE_NGINX_PORT }} default_server; listen {{ XQUEUE_NGINX_PORT }} default_server;
location / { location / {
{% if XQUEUE_BASIC_AUTH %}
{% include "basic-auth.j2" %}
{% endif %}
try_files $uri @proxy_to_app; try_files $uri @proxy_to_app;
} }
......
...@@ -17,6 +17,9 @@ server { ...@@ -17,6 +17,9 @@ server {
listen {{ XSERVER_NGINX_PORT }} default_server; listen {{ XSERVER_NGINX_PORT }} default_server;
location / { location / {
{% if XSERVER_BASIC_AUTH %}
{% include "basic-auth.j2" %}
{% endif %}
try_files $uri @proxy_to_app; try_files $uri @proxy_to_app;
} }
......
# vars for the ORA role # vars for the ORA role
--- ---
ORA_NGINX_PORT: 18060 ORA_NGINX_PORT: 18060
ORA_BASIC_AUTH: False
ora_code_dir: "{{ app_base_dir }}/edx-ora" ora_code_dir: "{{ app_base_dir }}/edx-ora"
# Default nginx listen port # Default nginx listen port
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# when the role is included # when the role is included
--- ---
XQUEUE_NGINX_PORT: 18040 XQUEUE_NGINX_PORT: 18040
XQUEUE_BASIC_AUTH: False
xqueue_code_dir: "{{ app_base_dir }}/xqueue" xqueue_code_dir: "{{ app_base_dir }}/xqueue"
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
--- ---
XSERVER_NGINX_PORT: 18050 XSERVER_NGINX_PORT: 18050
XSERVER_BASIC_AUTH: False
RABBIT_RUN_URL: '' RABBIT_RUN_URL: ''
RABBIT_GRADER_ROOT: '' RABBIT_GRADER_ROOT: ''
RABBIT_LOGGING_ENV: 'sandbox' RABBIT_LOGGING_ENV: 'sandbox'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment