Moved qbitclients to gluetun network

Added grafana, prometheus and snmp exporter for madrigal and node exporter for aya01

Signed-off-by: TuDatTr <tuan-dat.tran@tudattr.dev>

roles/docker/tasks/aya01_compose.yml

@@ -56,13 +56,25 @@
   tags:
     - bin
 
+- include_tasks: gluetun.yml
+  tags:
+    - gluetun
+
 - include_tasks: qbit.yml
   tags:
     - qbit
 
 - include_tasks: qbit_private.yml
   tags:
-    - qbit_private
+    - qbit_priv
+
+- include_tasks: prometheus.yml
+  tags:
+    - prometheus
+
+- include_tasks: grafana.yml
+  tags:
+    - grafana
 
 - name: Copy the compose file
   template: 

roles/docker/tasks/gluetun.yml

@@ -0,0 +1,11 @@
+---
+- name: Create gluetun-config directory
+  file:
+    path: "{{ item }}"
+    owner: "{{ puid }}"
+    group: "{{ pgid }}"
+    mode: '775'
+    state: directory
+  loop:
+    - "{{ gluetun_config}}"
+  become: true

roles/docker/tasks/grafana.yml

@@ -2,21 +2,21 @@
 - name: Create grafana data directory
   file:
     path: "{{ item }}"
-    owner: "{{ puid }}"
-    group: "{{ pgid }}"
+    owner: "{{ grafana_puid }}"
+    group: "{{ grafana_pgid }}"
     mode: '755'
     state: directory
   loop:
     - "{{ grafana_data }}"
-    - "{{ grafana_log }}"
     - "{{ grafana_config }}"
   become: true
 
 - name: Copy grafana config
   template:
-    owner: "{{ puid }}"
-    src: "templates/aya01/grafana/etc-grafana/grafana.ini"
+    owner: "{{ grafana_puid }}"
+    group: "{{ grafana_pgid }}"
+    src: "templates/aya01/grafana/etc-grafana/grafana.ini.j2"
     dest: "{{ grafana_config }}/grafana.ini"
-    mode: '660'
+    mode: '644'
   become: true
 

roles/docker/tasks/install.yml

@@ -39,7 +39,7 @@
   ansible.builtin.get_url:
     url: "{{ docker_apt_gpg_key }}"
     dest: /etc/apt/trusted.gpg.d/docker.asc
-    mode: '0644'
+    mode: '0664'
     force: true
   become: true
 

roles/docker/tasks/prometheus.yml

@@ -1,42 +1,19 @@
 ---
-
 - name: Create prometheus dirs
   file:
     path: "{{ item }}"
-    owner: 1000
-    group: 1000
-    mode: '777'
+    owner: "{{ puid }}"
+    group: "{{ pgid}}"
+    mode: '775'
     state: directory   
   loop:
-    - "{{ prm_config }}"
-    - "{{ prm_data}}"
+    - "{{ prometheus_config }}"
+    - "{{ prometheus_data }}"
 
 - name: Place prometheus config
   template:
-    owner: 1000
-    mode: '777'
-    src: "templates/aya01/prometheus/prometheus.yml"
-    dest: "{{ prm_config }}/prometheus.yml"
-
-- name: Create prometheus exporter dir
-  file:
-    path: "{{ exporter_dir }}"
-    owner: 1000
-    group: 1000
-    mode: '755'
-    state: directory   
-
-- name: Create mikrotik exporters config dir
-  file:
-    path: "{{ e_mikrotik_config }}"
-    owner: 1000
-    group: 1000
-    mode: '755'
-    state: directory   
-
-- name: Place mikrotik exporter config
-  template:
-    owner: 1000
-    mode: '400'
-    src: "templates/aya01/prometheus/exporter/mikrotik/config/config.yml"
-    dest: "{{ e_mikrotik_config }}/config.yml"
+    owner: "{{ puid }}"
+    group: "{{ pgid}}"
+    mode: '644'
+    src: "templates/aya01/prometheus/prometheus.yml.j2"
+    dest: "{{ prometheus_config }}/prometheus.yml"

roles/docker/tasks/qbit.yml

@@ -8,15 +8,5 @@
     state: directory
   loop:
     - "{{ qbit_remote_config }}"
-    - "{{ qbit_remote_config }}/openvpn"
     - "{{ qbit_downloads }}"
   become: true
-
-- name: Copy ovpn-config
-  template:
-    owner: "{{ puid }}"
-    group: "{{ pgid }}"
-    src: "{{ qbit_config }}/{{ qbit_ovpn_config }}"
-    dest: "{{ qbit_remote_config }}/{{ qbit_ovpn_config }}"
-    mode: '664'
-  become: true

roles/docker/tasks/qbit_private.yml

@@ -0,0 +1,12 @@
+---
+- name: Create qbit_torrentleech-config directory
+  file:
+    path: "{{ item }}"
+    owner: "{{ puid }}"
+    group: "{{ pgid }}"
+    mode: '775'
+    state: directory
+  loop:
+    - "{{ torrentleech_remote_config }}"
+    - "{{ qbit_downloads }}"
+  become: true

roles/docker/tasks/swag.yml

@@ -15,6 +15,6 @@
     group: "{{ pgid }}"
     src: "{{ item }}"
     dest: "{{ swag_remote_site_confs }}"
-    mode: '644'
+    mode: '664'
   loop: "{{ swag_site_confs }}"
   become: true