fixup! Allow enabling HTTP basic auth for individual services.

playbooks/roles/nginx/defaults/main.yml

@@ -115,22 +115,26 @@ NGINX_ROBOT_RULES: [ ]
 NGINX_EDXAPP_EMBARGO_CIDRS: []
 
 CERTS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
+ECOMMERCE_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 EDXAPP_CMS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 EDXAPP_LMS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
-EDXAPP_PREVIEW_LMS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
+EDXAPP_LMS_PREVIEW_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 KIBANA_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 ORA_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
+PROGRAMS_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 XQUEUE_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 XSERVER_ENABLE_BASIC_AUTH: "{{ COMMON_ENABLE_BASIC_AUTH }}"
 
 NGINX_CREATE_HTPASSWD_FILE: >
   {{
     CERTS_ENABLE_BASIC_AUTH or
+    ECOMMERCE_ENABLE_BASIC_AUTH or
     EDXAPP_CMS_ENABLE_BASIC_AUTH or
     EDXAPP_LMS_ENABLE_BASIC_AUTH or
-    EDXAPP_PREVIEW_LMS_ENABLE_BASIC_AUTH or
+    EDXAPP_LMS_PREVIEW_ENABLE_BASIC_AUTH or
     KIBANA_ENABLE_BASIC_AUTH or
     ORA_ENABLE_BASIC_AUTH or
+    PROGRAMS_ENABLE_BASIC_AUTH or
     XQUEUE_ENABLE_BASIC_AUTH or
     XSERVER_ENABLE_BASIC_AUTH
   }}

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/ecommerce.j2

@@ -38,6 +38,9 @@ server {
   }
 
   location / {
+    {% if ECOMMERCE_ENABLE_BASIC_AUTH %}
+      {% include "basic-auth.j2" %}
+    {% endif %}
     try_files $uri @proxy_to_app;
   }
 

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/lms-preview.j2

@@ -37,7 +37,7 @@ server {
   }
 
   location / {
-    {% if EDXAPP_PREVIEW_LMS_ENABLE_BASIC_AUTH %}
+    {% if EDXAPP_LMS_PREVIEW_ENABLE_BASIC_AUTH %}
       {% include "basic-auth.j2" %}
     {% endif %}
     try_files $uri @proxy_to_lms-preview_app;

playbooks/roles/nginx/templates/edx/app/nginx/sites-available/programs.j2

@@ -38,6 +38,9 @@ server {
   }
 
   location / {
+    {% if PROGRAMS_ENABLE_BASIC_AUTH %}
+      {% include "basic-auth.j2" %}
+    {% endif %}
     try_files $uri @proxy_to_app;
   }