Allow docker deployment

Author: Lenhard Reuter

defaults/main.yml

@@ -1,13 +1,13 @@
 ---
 novnc_server_name: "novnc.cyberrange.rocks"
-novnc_listen: "80"
 novnc_listen_ssl: "443 ssl"
 
 novnc_upstreams: []
 novnc_htpasswd_credentials: []
 
 fabric_copypaste_bar: true
 fabric_wwwroot: "/var/www/fabric"
+fabric_conf_wwwroot: "{{ fabric_wwwroot }}"
 fabric_index_template: "{{ 'index.html.j2' if fabric_copypaste_bar else 'minimal.html.j2' }}"
 
 fabric_version: "latest"
@@ -17,3 +17,6 @@ fabric_title: "AIT Fabric"
 
 novnc_ssl_cert: ""
 novnc_ssl_key: ""
+
+fabric_docker_nginx: false
+fabric_docker_nginx_conf_file: /etc/nginx/conf.d/novnc.conf

tasks/main.yml

@@ -5,6 +5,15 @@
     file: nginx.yml
     apply:
       become: true
+  when: not fabric_docker_nginx
+
+- name: Add NGINX configuration file
+  become: true
+  ansible.builtin.template:
+    dest: "{{ fabric_docker_nginx_conf_file }}"
+    src: nginx_novnc.conf.j2
+    mode: "0644"
+  when: fabric_docker_nginx
 
 - name: Configure and install fabric
   tags: [fabric]

templates/nginx_novnc.conf.j2

@@ -4,41 +4,23 @@ upstream {{ upstream.name }} {
 }
 {% endfor %}
 
-{% if novnc_ssl_cert and novnc_ssl_key %}
 server {
-  listen {{ novnc_listen }};
+  listen 80;
   server_name {{ novnc_server_name }};
 
   location / {
     return 301 https://$host$request_uri;
   }
 }
-{% endif %}
 
 server {
-{% if novnc_ssl_cert and novnc_ssl_key %}
   listen {{ novnc_listen_ssl }};
   ssl_certificate     {{ novnc_ssl_cert }};
   ssl_certificate_key {{ novnc_ssl_key }};
-{% else %}
-  listen {{ novnc_listen }};
-{% endif %}
 
   server_name {{ novnc_server_name }};
-  root        {{ fabric_wwwroot }};
+  root        {{ fabric_conf_wwwroot }};
 
-{% if novnc_htpasswd_credentials %}
-  auth_basic           "noVNC Authentication";
-  auth_basic_user_file /etc/nginx/passwdfile;
-
-  location = / {
-    try_files DUMMY @login;
-  }
-
-  location @login {
-    return 302 $scheme://$host/$remote_user;
-  }
-{% endif %}
   location / {
     try_files      $uri $uri/ /index.html;
   }
@@ -57,10 +39,6 @@ server {
 
 {% for upstream in novnc_upstreams %}
   location /upstream/{{ upstream.name }} {
-{% if novnc_htpasswd_credentials %}
-    auth_basic           "noVNC {{ upstream.username }} Authentication";
-    auth_basic_user_file /etc/nginx/passwd-{{ upstream.username }};
-{% endif %}
     proxy_pass http://{{ upstream.name }}/;
   }