diff options
Diffstat (limited to '')
| -rw-r--r-- | roles/media/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/media/templates/nginx-include | 20 |
2 files changed, 14 insertions, 7 deletions
diff --git a/roles/media/defaults/main.yml b/roles/media/defaults/main.yml index 0d8046d..3cdf81c 100644 --- a/roles/media/defaults/main.yml +++ b/roles/media/defaults/main.yml @@ -1 +1,2 @@ media_protect_root: false +media_server_name: media.emacsconf.org diff --git a/roles/media/templates/nginx-include b/roles/media/templates/nginx-include index f61d5c5..922bebb 100644 --- a/roles/media/templates/nginx-include +++ b/roles/media/templates/nginx-include @@ -1,10 +1,13 @@ 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; - autoindex on; - } +auth_basic "Restricted"; +auth_basic_user_file /etc/nginx/sites-available/{{ host_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; +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; +} {% if media_protect_root %} location /{{ emacsconf_year }} { auth_basic "Restricted"; @@ -12,11 +15,14 @@ location /{{ emacsconf_year }}/backstage { autoindex on; } {% endif %} - location /{{ emacsconf_year }}/emacsconf.ics { + location /{{ emacsconf_year }}/{{ emacsconf_id }}.ics { + auth_basic off; + } + location /{{ emacsconf_year }}/schedules/ { auth_basic off; } {% for track in emacsconf_tracks %} - location /{{ emacsconf_year }}/emacsconf-{{ track.id }}.ics { + location /{{ emacsconf_year }}/{{ emacsconf_id }}-{{ track.id }}.ics { auth_basic off; } {% endfor %}
\ No newline at end of file |