summaryrefslogtreecommitdiffstats
path: root/roles/media/templates/nginx-include
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2023-10-17 11:58:42 -0400
committerSacha Chua <sacha@sachachua.com>2023-10-17 11:58:42 -0400
commitebba562c95e2f50c5cbac1706fd62457cf9d5eaa (patch)
treee58e27f223957fdf3b996328ce56af224d8f732a /roles/media/templates/nginx-include
parent6f128bfc6c0172e05fc581a7150258d4dc978031 (diff)
downloademacsconf-ansible-ebba562c95e2f50c5cbac1706fd62457cf9d5eaa.tar.xz
emacsconf-ansible-ebba562c95e2f50c5cbac1706fd62457cf9d5eaa.zip
media server updates
Diffstat (limited to 'roles/media/templates/nginx-include')
-rw-r--r--roles/media/templates/nginx-include4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/media/templates/nginx-include b/roles/media/templates/nginx-include
index 0f74c60..416e1ca 100644
--- a/roles/media/templates/nginx-include
+++ b/roles/media/templates/nginx-include
@@ -1,7 +1,7 @@
rewrite ^/current/bbb-open.html$ {{ bbb_open_url }} redirect;
location /{{ emacsconf_year }}/backstage {
auth_basic "Restricted";
- auth_basic_user_file /etc/nginx/sites-available/{{ host_name }}-{{ emacsconf_year }}-htpasswd;
+ auth_basic_user_file /etc/nginx/sites-available/{{ media_server_name }}-{{ emacsconf_year }}-htpasswd;
autoindex on;
rewrite ^/{{ emacsconf_year }}/backstage/current/pad/([^/]*)$ https://{{ etherpad_server_name }}/{{ emacsconf_year }}-$1 redirect;
rewrite ^/{{ emacsconf_year }}/backstage/current/room/([^/]*)$ https://{{ media_server_name }}/{{ emacsconf_year }}/backstage/assets/redirects/open/bbb-$1.html redirect;
@@ -22,7 +22,7 @@ location /{{ emacsconf_year }}/backstage {
{% if media_protect_root == 'true' %}
location /{{ emacsconf_year }} {
# TODO: Figure out how to make this properly controlled by the variable
- auth_basic_user_file /etc/nginx/sites-available/{{ host_name }}-{{ emacsconf_year }}-htpasswd;
+ auth_basic_user_file /etc/nginx/sites-available/{{ media_server_name }}-{{ emacsconf_year }}-htpasswd;
auth_basic "Restricted";
autoindex on;
}