hosts

@@ -7,6 +7,3 @@ vps02.comprofix.com
 [docker]
 docker.comprofix.xyz
 
-[omada]
-omada-lxc.comprofix.xyz ansible_user=root
-

main.yml

@@ -1,10 +1,11 @@
 ---
+
 - hosts: all
   name: Configure all servers
   tasks:
-    - name: Gather facts if run with tags
+  - name: Gather facts if run with tags
-      ansible.builtin.setup:
+    ansible.builtin.setup:
-      when: ansible_run_tags | length
+    when: ansible_run_tags | length
   tags: always
 
 - hosts: all
@@ -25,6 +26,7 @@
       tags: traefik_install
 
   tasks: 
+
     - name: Deploy Vaultwarden
       import_tasks: tasks/vaultwarden.yml
       tags: vaultwarden_install
@@ -46,15 +48,16 @@
       tags: docker_install
     - role: nfs
       mounts:
-        - name: Data share
+      - name: Data share
-          path: /mnt/nfs/data
+        path: /mnt/nfs/data
-          src: truenas.comprofix.xyz:/mnt/datapool/data
+        src: truenas.comprofix.xyz:/mnt/datapool/data
       tags: nfs_install
     - role: traefik
       vars:
         traefik_host: traefik02.comprofix.xyz
       tags: traefik_install
   tasks:
+      
     - name: Deploy comprofix.com website
       import_tasks: tasks/comprofix.com.yml
       tags: comprofix_install
@@ -129,27 +132,13 @@
 
   tags: dockerserver_install
 
-- hosts: omada
-  become: yes
-  pre_tasks:
-    - name: Update packages
-      import_tasks: tasks/base.yml
-      tags: base_install
-  roles:
-    - role: docker
-      tags: docker_install
-    - role: nfs
-      mounts:
-        - name: Data share
-          path: /data
-          src: truenas.comprofix.xyz:/mnt/datapool/docker
-      tags: nfs_install
-  tasks:
-    - name: Deploy Dozzle Agent
-      import_tasks: tasks/dozzle-agent.yml
-      tags: dozzle_agent
 
-    - name: Deploy Omada
+
-      import_tasks: tasks/omada.yml
+
-      tags: omada_container_install
+
-  tags: omada_install
+
+
+
+
+  
+

roles/traefik/tasks/main.yml

@@ -16,14 +16,7 @@
   template:
     src: templates/traefik.yml.j2
     dest: "{{ data_folder }}/traefik/data/traefik.yml"
-    mode: "0600"
+    mode: '0600'
-
-- name: Copy Traefik config
-  template:
-    src: templates/config.yml.j2
-    dest: "{{ data_folder }}/traefik/data/config.yml"
-    mode: "0600"
-  when: traefik_host == "traefik02.comprofix.xyz"
 
 - name: Check if {{ data_folder }}/traefik/data/acme.json exists
   ansible.builtin.stat:
@@ -36,7 +29,7 @@
     state: touch
     owner: root
     group: root
-    mode: "0600"
+    mode: '0600'
   when: not file_status.stat.exists
 
 - name: Check if {{ data_folder }}/traefik/data/traefik.json.log exists
@@ -50,7 +43,7 @@
     state: touch
     owner: root
     group: root
-    mode: "0600"
+    mode: '0600'
   when: not file_status.stat.exists
 
 - name: Create traefik Container
@@ -72,7 +65,7 @@
       - "{{ data_folder }}/traefik/data/traefik.yml:/traefik.yml:ro"
       - "{{ data_folder }}/traefik/data/acme.json:/acme.json"
       - "{{ data_folder }}/traefik/data/traefik.json.log:/traefik.json.log"
-      - "{{ data_folder }}/traefik/data/config.yml:/config.yml:ro"
+      # - ./data/config.yml:/config.yml:ro
     labels:
       traefik.enable: "true"
       traefik.http.routers.traefik.entrypoints: "http"

roles/traefik/templates/config.yml.j2

@@ -1,51 +0,0 @@
----
-http:
-  routers:
-    oc-router:
-      entryPoints:
-        - "https"
-      service: oc-service
-      rule: "Host(`omada.comprofix.xyz`)" # change it to actual address
-      tls: {}
-      middlewares:
-        - default-headers
-        - https-redirect
-
-  services:
-    oc-service:
-      loadBalancer:
-        servers:
-          - url: https://omada-lxc.comprofix.xyz:8043 # change it to actual ip of the controller
-
-  middlewares:
-    https-redirect:
-      redirectScheme:
-        scheme: https
-        permanent: true
-
-    default-headers:
-      headers:
-        frameDeny: true
-        sslRedirect: true
-        browserXssFilter: true
-        contentTypeNosniff: true
-        forceSTSHeader: true
-        stsIncludeSubdomains: true
-        stsPreload: true
-        stsSeconds: 15552000
-        customFrameOptionsValue: SAMEORIGIN
-        customRequestHeaders:
-          X-Forwarded-Proto: https
-
-    default-whitelist:
-      IPAllowList:
-        sourceRange:
-        - "10.0.0.0/8"
-        - "192.168.0.0/16"
-        - "172.16.0.0/12"
-        - "100.64.0.0/10"
-
-    secured:
-      chain:
-        middlewares:
-        - default-headers

tasks/dozzle-agent.yml

@@ -1,11 +0,0 @@
-- name: Create the dozzle agent container
-  docker_container:
-    name: dozzle-agent
-    image: amir20/dozzle:v8.8.0
-    command: agent
-    restart_policy: unless-stopped
-    recreate: true
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    ports:
-      - 7007:7007

tasks/dozzle.yml

@@ -10,7 +10,7 @@
 - name: Create the dozzle container
   docker_container:
     name: dozzle
-    image: amir20/dozzle:v8.8.0
+    image: amir20/dozzle:v8.7.2
     restart_policy: unless-stopped
     recreate: true
     networks:
@@ -19,7 +19,7 @@
       - /var/run/docker.sock:/var/run/docker.sock
     env:
       DOZZLE_LEVEL: "trace"
-      DOZZLE_REMOTE_AGENT: "omada-lxc.comprofix.xyz:7007"
+      DOZZLE_REMOTE_HOST: "tcp://omada.comprofix.xyz:2375,tcp://vps02.comprofix.com:2375"
     labels:
       traefik.enable: "true"
       traefik.http.routers.dozzle.rule: "Host(`dozzle.comprofix.xyz`)"

tasks/idrac.yml

@@ -9,7 +9,7 @@
       IDRAC_HOST: "10.10.10.138"
       IDRAC_USERNAME: "root"
       IDRAC_PASSWORD: "calvin"
-      FAN_SPEED: "50"
+      FAN_SPEED: "35"
       CPU_TEMPERATURE_THRESHOLD: "80"
       CHECK_INTERVAL: "60"
       DISABLE_THIRD_PARTY_PCIE_CARD_DELL_DEFAULT_COOLING_RESPONSE: "true"

tasks/jellyseerr.yml

@@ -10,7 +10,7 @@
 - name: Create the jellyseerr container
   docker_container:
     name: jellyseerr
-    image: fallenbagel/jellyseerr:2.1.0 
+    image: fallenbagel/jellyseerr:2.0.1 
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/lidarr.yml

@@ -14,7 +14,7 @@
 - name: Create the lidarr container
   docker_container:
     name: lidarr
-    image: ghcr.io/linuxserver/lidarr:latest@sha256:5c1f7a05944a1ceea242481801bbc5f908a4cc66e95ae0153b5a59f2d6224b17
+    image: ghcr.io/linuxserver/lidarr:latest@sha256:c4d9107e03efb0d73bd4491bdb3110fa497da8b53493f60404fbd53087ff0119
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/omada.yml

@@ -1,24 +0,0 @@
----
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_folder }}/omada"
-    - "{{ data_folder }}/omada/data"
-    - "{{ data_folder }}/omada/logs"
-
-- name: Create the omada container
-  docker_container:
-    name: omada
-    image: mbentley/omada-controller:5.14
-    restart_policy: unless-stopped
-    recreate: true
-    network_mode: host
-    volumes:
-      - "{{ data_folder }}/omada/data:/opt/tplink/EAPController/data"
-      - "{{ data_folder }}/omada/logs:/opt/tplink/EAPController/logs"
-    env:
-      PUID: "1000"
-      PGID: "1000"
-      TZ: "Australia/Brisbane"

tasks/speedtest.yml

@@ -11,7 +11,7 @@
 - name: Create the speedtest container
   docker_container:
     name: speedtest
-    image: lscr.io/linuxserver/speedtest-tracker:0.21.6
+    image: lscr.io/linuxserver/speedtest-tracker:0.21.5
     restart_policy: unless-stopped
     recreate: true
     networks: