Fix install_brotli playbook, Update nginx.conf

Author: Vic Shóstak

README.md

@@ -76,7 +76,7 @@ Ansible is a radically simple IT automation system. It handles configuration man
 
 **VS Code config hints:**
 
-For better readability, please add two association to your `.vscode/settings.json`: 
+For better readability, please add two association to your `.vscode/settings.json`:
 
 1. For `Ansible` playbooks
 2. For `jinja2` templates (which uses for `Nginx` configs)
@@ -164,11 +164,12 @@ ansible-playbook \
 
 **Features:**
 
+- Added lines to files:
+  - `load_module` lines with Brotli module to the start of Nginx config (`/etc/nginx/nginx.conf`)
 - Installed latest versions:
   - [`Brotli`](https://github.com/google/brotli)
   - [`Brotli module`](https://github.com/google/ngx_brotli) for Nginx
 - Configured by the best practice:
-  - Nginx
   - Brotli
 
 **Tested to work:**

configs/nginx.conf

@@ -1,7 +1,3 @@
-# Add Brotli modules
-load_module "modules/ngx_http_brotli_filter_module.so";
-load_module "modules/ngx_http_brotli_static_module.so";
-
 # Start NGINX configuration
 worker_processes  auto;
 

create_ssl-playbook.yml

@@ -8,12 +8,14 @@
       apt:
         pkg: software-properties-common
         state: latest
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_release != 'focal'
 
     - name: Add PPA repositories
       apt_repository:
         repo: "{{ item.repo }}"
       with_items:
         - { repo: "ppa:certbot/certbot" }
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_release != 'focal'
 
     - name: Update dist
       apt: 
@@ -43,11 +45,14 @@
         src: ./templates/http-domain.j2
         dest: /etc/nginx/sites-available/{{ domain }}.conf
 
-    - name: Create symbolic link for {{ domain }}.conf to /etc/nginx/sites-enabled/
+    - name: Create symbolic link for {{ domain }}.conf to /etc/nginx/sites-enabled
       file:
         state: link
         src: /etc/nginx/sites-available/{{ domain }}.conf
-        dest: /etc/nginx/sites-enabled/
+        dest: /etc/nginx/sites-enabled/{{ domain }}.conf
+        owner: "{{ ansible_user }}"
+        group: "{{ ansible_user }}"
+        mode: 0644
       notify:
         - restart_nginx
 

install_brotli-playbook.yml

@@ -52,6 +52,15 @@
         - { src: "~/nginx-{{ nginx_version }}/objs/ngx_http_brotli_filter_module.so", dest: "/usr/share/nginx/modules" }
         - { src: "~/nginx-{{ nginx_version }}/objs/ngx_http_brotli_static_module.so", dest: "/usr/share/nginx/modules" }
 
+    - name: Add Brotli module to start of Nginx config
+      lineinfile:
+        path: /etc/nginx/nginx.conf
+        insertbefore: BOF
+        line: "{{ item.line }}"
+      with_items:
+        - { line: 'load_module "modules/ngx_http_brotli_filter_module.so";' }
+        - { line: 'load_module "modules/ngx_http_brotli_static_module.so";' }
+
     - name: Copy Brotli config
       copy: 
         src: "{{ item.src }}"
@@ -60,7 +69,6 @@
         group: "{{ ansible_user }}"
         mode: 0644
       with_items:
-        - { src: "./configs/nginx.conf", dest: "/etc/nginx/nginx.conf" }
         - { src: "./configs/brotli.conf", dest: "/etc/nginx/conf.d/brotli.conf" }
       notify:
         - restart_nginx

new_vds-playbook.yml

@@ -8,6 +8,7 @@
       apt:
         pkg: software-properties-common
         state: latest
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_release != 'focal'
 
     - name: Add PPA repositories
       apt_repository: