Merge pull request #3868 from open-craft/nginx-custom-settings

nginx: Make it possible to add custom settings to site configuration for Studio and LMS.

CHANGELOG.md

+- Role: nginx
+  - Added `NGINX_EDXAPP_CMS_APP_EXTRA`, which makes it possible to add custom settings to the site configuration for Studio.
+  - Added `NGINX_EDXAPP_LMS_APP_EXTRA`, which makes it possible to add custom settings to the site configuration for the LMS.
+
 - Role: edxapp
   - Let `confirm_email` in `EDXAPP_REGISTRATION_EXTRA_FIELDS` default to `"hidden"`.
   - Let `terms_of_service` in `EDXAPP_REGISTRATION_EXTRA_FIELDS` default to `"hidden"`.

playbooks/roles/nginx/defaults/main.yml

@@ -153,3 +153,8 @@ NGINX_CREATE_HTPASSWD_FILE: >
     XQUEUE_ENABLE_BASIC_AUTH|bool or
     XSERVER_ENABLE_BASIC_AUTH|bool
   }}
+
+# Extra settings to add to site configuration for Studio
+NGINX_EDXAPP_CMS_APP_EXTRA: ""
+# Extra settings to add to site configuration for LMS
+NGINX_EDXAPP_LMS_APP_EXTRA: ""

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

@@ -104,6 +104,8 @@ error_page {{ k }} {{ v }};
 
     proxy_redirect off;
     proxy_pass http://cms-backend;
+
+    {{ NGINX_EDXAPP_CMS_APP_EXTRA }}
   }
 
   location / {

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

@@ -149,6 +149,8 @@ error_page {{ k }} {{ v }};
 
     proxy_redirect off;
     proxy_pass http://lms-backend;
+
+    {{ NGINX_EDXAPP_LMS_APP_EXTRA }}
   }
 
   location / {