Use nginx conf.d

Author: Lenhard Reuter

tasks/fabric.yml

@@ -1,25 +1,25 @@
 ---
 - name: Create fabric directory
   ansible.builtin.file:
-      path: '{{ fabric_wwwroot }}'
-      state: directory
-      mode: '0755'
+    path: "{{ fabric_wwwroot }}"
+    state: directory
+    mode: "0755"
 
 - name: Copy css and js for fabric html
   ansible.builtin.copy:
-      dest: '{{ fabric_wwwroot }}/'
-      src: 'fabricweb/'
-      mode: '0644'
+    dest: "{{ fabric_wwwroot }}/"
+    src: "fabricweb/"
+    mode: "0644"
   when: fabric_copypaste_bar
 
 - name: Deploy novnc HTML
   ansible.builtin.template:
-      dest: '{{ fabric_wwwroot }}/index.html'
-      src: '{{ fabric_index_template }}'
-      mode: '0644'
+    dest: "{{ fabric_wwwroot }}/index.html"
+    src: "{{ fabric_index_template }}"
+    mode: "0644"
 
 - name: Download fabric
   ansible.builtin.get_url:
-      url: '{{ fabric_release_url }}/{{ fabric_version }}/main.js'
-      dest: '{{ fabric_wwwroot }}/main.js'
-      mode: '0644'
+    url: "{{ fabric_release_url }}/{{ fabric_version }}/main.js"
+    dest: "{{ fabric_wwwroot }}/main.js"
+    mode: "0644"

tasks/main.yml

@@ -2,13 +2,13 @@
 - name: Configure and install nginx
   tags: [nginx]
   ansible.builtin.include_tasks:
-      file: nginx.yml
-      apply:
-          become: true
+    file: nginx.yml
+    apply:
+      become: true
 
 - name: Configure and install fabric
   tags: [fabric]
   ansible.builtin.include_tasks:
-      file: fabric.yml
-      apply:
-          become: true
+    file: fabric.yml
+    apply:
+      become: true

tasks/nginx.yml

@@ -2,47 +2,46 @@
 - name: Install nginx package
   tags: [install]
   ansible.builtin.apt:
-      name: nginx
-      state: present
+    name: nginx
+    state: present
 
 - name: Remove default config
   ansible.builtin.file:
-      path: '{{ item }}'
-      state: absent
-  with_items: ['/etc/nginx/sites-enabled/default', '/etc/nginx/conf.d']
+    path: "/etc/nginx/sites-enabled/"
+    state: absent
   notify: Restart nginx
 
 - name: Add NGINX configuration file
   ansible.builtin.template:
-      dest: /etc/nginx/sites-enabled/novnc.conf
-      src: nginx_novnc.conf.j2
-      mode: '0644'
+    dest: /etc/nginx/conf.d/novnc.conf
+    src: nginx_novnc.conf.j2
+    mode: "0644"
   notify: Restart nginx
 
 - name: Ensure the htpasswd utility is installed
   ansible.builtin.apt:
-      name: ['apache2-utils', 'python3-passlib']
-      state: present
+    name: ["apache2-utils", "python3-passlib"]
+    state: present
   when: novnc_htpasswd_credentials
 
 - name: Ensure htpasswd credentials are configured
   community.general.htpasswd:
-      path: '/etc/nginx/passwdfile'
-      name: '{{ item.name }}'
-      password: '{{ item.password }}'
-      owner: 'root'
-      group: 'www-data'
-      mode: '0640'
-  with_items: '{{ novnc_htpasswd_credentials }}'
+    path: "/etc/nginx/passwdfile"
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    owner: "root"
+    group: "www-data"
+    mode: "0640"
+  with_items: "{{ novnc_htpasswd_credentials }}"
   no_log: true
 
 - name: Per User htpasswd
   community.general.htpasswd:
-      path: '/etc/nginx/passwd-{{ item.name }}'
-      name: '{{ item.name }}'
-      password: '{{ item.password }}'
-      owner: 'root'
-      group: 'www-data'
-      mode: '0640'
-  with_items: '{{ novnc_htpasswd_credentials }}'
+    path: "/etc/nginx/passwd-{{ item.name }}"
+    name: "{{ item.name }}"
+    password: "{{ item.password }}"
+    owner: "root"
+    group: "www-data"
+    mode: "0640"
+  with_items: "{{ novnc_htpasswd_credentials }}"
   no_log: true