Fix: Rebase

Chore: Moved to ruff and sorted and cleaned using it.
Chore: Ansible file moved to roles based.
Chore: Upgraded some dependencies

docker/playbook.yml

@@ -8,73 +8,7 @@
     - "{{ var_file }}"
     - vars/default.yml
 
-  tasks:
-    - name: Copy dockerfile
-      synchronize:
-        src: app
-        dest: "/tmp/{{ host_directory }}"
-
-    - name: Build brewman image
-      docker_image:
-        name: brewman:latest
-        build:
-          path: "/tmp/{{ host_directory }}/"
-          dockerfile: "/tmp/{{ host_directory }}/Dockerfile"
-          pull: yes
-        state: present
-        source: build
-
-    - name: Ensure Host Directory exists
-      file:
-          path: "/var/lib/{{ host_directory }}"
-          state: directory
-
-    - name: Upload the .env file
-      template:
-        src: "files/.env"
-        dest: "/var/lib/{{ host_directory }}/.env"
-
-    - name: Create brewman container
-      docker_container:
-        name: "{{ host_directory }}"
-        image: brewman:latest
-        state: started
-        restart_policy: "unless-stopped"
-        env_file: "/var/lib/{{ host_directory }}/.env"
-        etc_hosts:
-          db : "{{ db_host }}"
-        # links:
-        #   - "postgres:db"
-        published_ports:
-          - "127.0.0.1:{{ host_port }}:80"
-        volumes:
-          - "/var/lib/{{ host_directory }}/frontend:/frontend"
-
-
-    - name: Check if Nginx conf file exists
-      stat: path="/etc/nginx/sites-available/{{ http_conf }}"
-      register: status
-
-    - name: No need to reload Nginx
-      debug: msg= {{ "No need to reload Nginx as sites-available entries have already been created" }}
-
-    - name: Set Nginx conf file
-      when: status.stat.exists == false
-      template:
-        src: "files/nginx.conf.j2"
-        dest: "/etc/nginx/sites-available/{{ http_conf }}"
-
-    - name: Enable new site
-      when: status.stat.exists == false
-      file:
-        src: "/etc/nginx/sites-available/{{ http_conf }}"
-        dest: "/etc/nginx/sites-enabled/{{ http_conf }}"
-        state: link
-      notify: Reload Nginx
-
-  handlers:
-    - name: Reload Nginx
-      service:
-        name: nginx
-        state: reloaded
-
+  roles:
+    - upload
+    - brewman
+    - nginx

docker/roles/brewman/tasks/main.yaml

@@ -0,0 +1,27 @@
+---
+# Tasks for docker role
+- name: Build brewman image
+  docker_image:
+    name: brewman:latest
+    build:
+      path: "/tmp/{{ host_directory }}/"
+      dockerfile: "/tmp/{{ host_directory }}/Dockerfile"
+      pull: yes
+    state: present
+    source: build
+
+- name: Create brewman container
+  docker_container:
+    name: "{{ host_directory }}"
+    image: brewman:latest
+    state: started
+    restart_policy: "unless-stopped"
+    env_file: "/var/lib/{{ host_directory }}/.env"
+    etc_hosts:
+      db : "{{ db_host }}"
+    # links:
+    #   - "postgres:db"
+    published_ports:
+      - "127.0.0.1:{{ host_port }}:80"
+    volumes:
+      - "/var/lib/{{ host_directory }}/frontend:/frontend"

docker/roles/nginx/handlers/main.yaml

@@ -0,0 +1,6 @@
+---
+# Handlers for Nginx role
+- name: Reload Nginx
+  service:
+    name: nginx
+    state: reloaded

docker/roles/nginx/tasks/main.yaml

@@ -0,0 +1,24 @@
+---
+# Tasks for Nginx role
+- name: Check if Nginx conf file exists
+  stat:
+    path: "/etc/nginx/sites-available/{{ http_conf }}"
+  register: status
+
+- name: No need to reload Nginx
+  debug:
+    msg: "No need to reload Nginx as sites-available entries have already been created"
+
+- name: Set Nginx conf file
+  when: status.stat.exists == false
+  template:
+    src: "files/nginx.conf.j2"
+    dest: "/etc/nginx/sites-available/{{ http_conf }}"
+
+- name: Enable new site
+  when: status.stat.exists == false
+  file:
+    src: "/etc/nginx/sites-available/{{ http_conf }}"
+    dest: "/etc/nginx/sites-enabled/{{ http_conf }}"
+    state: link
+  notify: Reload Nginx

docker/roles/upload/tasks/main.yaml

@@ -0,0 +1,21 @@
+---
+# Tasks for upload role
+- name: Ensure Temporary Directory exists
+  file:
+      path: "/tmp/{{ host_directory }}"
+      state: directory
+
+- name: Copy dockerfile
+  synchronize:
+    src: app
+    dest: "/tmp/{{ host_directory }}"
+
+- name: Ensure Host Directory exists
+  file:
+      path: "/var/lib/{{ host_directory }}"
+      state: directory
+
+- name: Upload the .env file
+  template:
+    src: "files/.env"
+    dest: "/var/lib/{{ host_directory }}/.env"