Unverified Commit efe93411 authored by boklm's avatar boklm
Browse files

Bug 33864: Add auth_basic to nightly build web server

parent 895efbcd

tools/ansible/roles/tbb-nightly-build/defaults/main.yml

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ testsuite_git_commit: ea0942f9da2bdbaf3f140f3baaed1bb56ee9af69 
nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www"

nightly_build_nginx_enable: true

nightly_build_nginx_listen: 127.0.0.1:80

nightly_build_nginx_auth_basic_enable: true

nightly_build_nginx_auth_basic_content: tor-guest:ezmjAG/jVTat.

tools/ansible/roles/tbb-nightly-build/tasks/main.yml

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ 
      mode: 0644

      owner: "{{ nightly_build_user }}"



- name: create tbb-nightly-build.auth_basic_user_file

  template:

        src: tbb-nightly-build.auth_basic_user_file

        dest: /etc/nginx/tbb-nightly-build.auth_basic_user_file

        mode: 0644

        owner: root

  when: nightly_build_nginx_auth_basic_enable



- name: install nginx

  apt:

      name: nginx

tools/ansible/roles/tbb-nightly-build/templates/nginx.conf

+4 −0
Original line number Diff line number Diff line
@@ -12,5 +12,9 @@ server { 
    location /tor-browser-builds {

        alias {{ testsuite_dir }}/tor-browser-builds;

        autoindex on;

        {% if nightly_build_nginx_auth_basic_enable %}

        auth_basic "Use tor-guest as username and password";

        auth_basic_user_file /etc/nginx/tbb-nightly-build.auth_basic_user_file;

        {% endif %}

    }

}

tools/ansible/roles/tbb-nightly-build/templates/tbb-nightly-build.auth_basic_user_file

0 → 100644
+1 −0
Original line number Diff line number Diff line 
{{ nightly_build_nginx_auth_basic_content }}