Use a common service role for other service roles

claha · Sep 23, 2023 · a5e384b · a5e384b
1 parent e15bcd9
commit a5e384b
Show file tree

Hide file tree

Showing 69 changed files with 652 additions and 686 deletions.
diff --git a/roles/autorestic/defaults/main.yaml b/roles/autorestic/defaults/main.yaml
@@ -1,4 +1,2 @@
 ---
-service_name: "{{ ansible_role_name }}"
-service_path: "{{ services_path }}/{{ service_name }}"
 autorestic_docker: true
diff --git a/roles/autorestic/tasks/main.yaml b/roles/autorestic/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "autorestic"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ service_path }}"

diff --git a/roles/dashdot/defaults/main.yaml b/roles/dashdot/defaults/main.yaml
diff --git a/roles/dashdot/tasks/main.yaml b/roles/dashdot/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "dashdot"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ service_path }}"

diff --git a/roles/diun/defaults/main.yaml b/roles/diun/defaults/main.yaml
diff --git a/roles/diun/handlers/main.yaml b/roles/diun/handlers/main.yaml
diff --git a/roles/diun/tasks/main.yaml b/roles/diun/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "diun"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ item }}"

diff --git a/roles/doku/defaults/main.yaml b/roles/doku/defaults/main.yaml
diff --git a/roles/doku/handlers/main.yaml b/roles/doku/handlers/main.yaml
diff --git a/roles/doku/tasks/main.yaml b/roles/doku/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "doku"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ service_path }}"

diff --git a/roles/dozzle/defaults/main.yaml b/roles/dozzle/defaults/main.yaml
diff --git a/roles/dozzle/handlers/main.yaml b/roles/dozzle/handlers/main.yaml
diff --git a/roles/dozzle/tasks/main.yaml b/roles/dozzle/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "dozzle"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ item }}"

diff --git a/roles/duckdns/defaults/main.yaml b/roles/duckdns/defaults/main.yaml
diff --git a/roles/duckdns/handlers/main.yaml b/roles/duckdns/handlers/main.yaml
diff --git a/roles/duckdns/tasks/main.yaml b/roles/duckdns/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "duckdns"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ item }}"

diff --git a/roles/gatus/defaults/main.yaml b/roles/gatus/defaults/main.yaml
@@ -1,6 +1,4 @@
 ---
-service_name: "{{ ansible_role_name }}"
-service_path: "{{ services_path }}/{{ service_name }}"
 gatus_icmp_endpoints: []
 gatus_dns_endpoints: []
 gatus_healthcheck_endpoints: []
diff --git a/roles/gatus/handlers/main.yaml b/roles/gatus/handlers/main.yaml
diff --git a/roles/gatus/tasks/main.yaml b/roles/gatus/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "gatus"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ item }}"

diff --git a/roles/github_deploy/defaults/main.yaml b/roles/github_deploy/defaults/main.yaml
diff --git a/roles/github_deploy/tasks/main.yaml b/roles/github_deploy/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "github-deploy"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ item }}"

diff --git a/roles/glances/defaults/main.yaml b/roles/glances/defaults/main.yaml
@@ -1,4 +1,2 @@
 ---
-service_name: "{{ ansible_role_name }}"
-service_path: "{{ services_path }}/{{ service_name }}"
 glances_proxy: false
diff --git a/roles/glances/handlers/main.yaml b/roles/glances/handlers/main.yaml
diff --git a/roles/glances/tasks/main.yaml b/roles/glances/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "glances"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ item }}"

diff --git a/roles/healthchecks/defaults/main.yaml b/roles/healthchecks/defaults/main.yaml
diff --git a/roles/healthchecks/handlers/main.yaml b/roles/healthchecks/handlers/main.yaml
diff --git a/roles/healthchecks/tasks/main.yaml b/roles/healthchecks/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "healthchecks"
+
 - name: Create service directory
   ansible.builtin.file:
     path: "{{ service_path }}"

diff --git a/roles/homeassistant/defaults/main.yaml b/roles/homeassistant/defaults/main.yaml
@@ -1,18 +1,16 @@
 ---
-service_name: "{{ ansible_role_name }}"
-service_path: "{{ services_path }}/{{ service_name }}"
-stocks: []
-funds: []
-glances: []
-glances_used_sensors:
+homeassistant_stocks: []
+homeassistant_funds: []
+homeassistant_glances: []
+homeassistant_glances_used_sensors:
   - etc_hosts_used_percent
   - etc_hosts_used
   - etc_hosts_free
   - ram_used_percent
   - ram_used
   - ram_free
   - cpu_used
-glances_unused_sensors:
+homeassistant_glances_unused_sensors:
   - etc_resolv_conf_used
   - etc_resolv_conf_used_percent
   - etc_resolv_conf_free
@@ -28,7 +26,7 @@ glances_unused_sensors:
   - total
   - thread
   - sleeping
-static_template_sensors:
+homeassistant_static_template_sensors:
   - name: Usage
     unit_of_measurement: "%"
     state: 0

diff --git a/roles/homeassistant/handlers/main.yaml b/roles/homeassistant/handlers/main.yaml
diff --git a/roles/homeassistant/tasks/main.yaml b/roles/homeassistant/tasks/main.yaml
@@ -1,4 +1,10 @@
 ---
+- name: Setup service
+  ansible.builtin.include_role:
+    name: service
+  vars:
+    service_name: "homeassistant"
+
 - name: Create directories
   ansible.builtin.file:
     path: "{{ item }}"
@@ -61,36 +67,36 @@
     name: hass_cli_hide_entity
   vars:
     hass_cli_hide_entity_id: "sensor.stock_{{ item.name | lower | replace(' ', '_') }}"  # yamllint disable rule:line-length
-  loop: "{{ stocks }}"
+  loop: "{{ homeassistant_stocks }}"
 
 - name: Hide fund entities
   ansible.builtin.include_role:
     name: hass_cli_hide_entity
   vars:
     hass_cli_hide_entity_id: "sensor.fund_{{ item.name | lower | replace(' ', '_') }}"  # yamllint disable rule:line-length
-  loop: "{{ funds }}"
+  loop: "{{ homeassistant_funds }}"
 
 - name: Hide glances entities
   ansible.builtin.include_role:
     name: hass_cli_hide_entity
   vars:
     hass_cli_hide_entity_id: "sensor.{{ item.0.hostname | replace('.', '_') }}_{{ item.1 }}"  # yamllint disable rule:line-length
   with_nested:
-    - "{{ glances }}"
-    - "{{ glances_used_sensors }}"
+    - "{{ homeassistant_glances }}"
+    - "{{ homeassistant_glances_used_sensors }}"
 
 - name: Disable glances entities
   ansible.builtin.include_role:
     name: hass_cli_disable_entity
   vars:
     hass_cli_disable_entity_id: "sensor.{{ item.0.hostname | replace('.', '_') }}_{{ item.1 }}"  # yamllint disable rule:line-length
   with_nested:
-    - "{{ glances }}"
-    - "{{ glances_unused_sensors }}"
+    - "{{ homeassistant_glances }}"
+    - "{{ homeassistant_glances_unused_sensors }}"
 
 - name: Hide static template entities
   ansible.builtin.include_role:
     name: hass_cli_hide_entity
   vars:
     hass_cli_hide_entity_id: "sensor.{{ item.name | lower }}_{{ item.state }}"
-  loop: "{{ static_template_sensors }}"
+  loop: "{{ homeassistant_static_template_sensors }}"
diff --git a/roles/homeassistant/templates/lovelace-monitor.yaml.j2 b/roles/homeassistant/templates/lovelace-monitor.yaml.j2
@@ -8,7 +8,7 @@ views:
     cards:
       - type: vertical-stack
         cards:
-{% for instance in glances %}
+{% for instance in homeassistant_glances %}
           - type: statistics-graph
             title: {{ instance.name }}
             chart_type: line
@@ -36,18 +36,18 @@ views:
               - type: entities
                 title: Used
                 entities:
-{% for instance in glances %}
+{% for instance in homeassistant_glances %}
                   - entity: sensor.{{ instance.hostname | replace('.', '_') }}_ram_used
                     name: {{ instance.name }}
 {% endfor %}
               - type: entities
                 title: Free
                 entities:
-{% for instance in glances %}
+{% for instance in homeassistant_glances %}
                   - entity: sensor.{{ instance.hostname | replace('.', '_') }}_ram_free
                     name: {{ instance.name }}
 {% endfor %}
-{% for instance in glances %}
+{% for instance in homeassistant_glances %}
           - type: statistics-graph
             title: {{ instance.name }}
             chart_type: line
@@ -75,18 +75,18 @@ views:
               - type: entities
                 title: Used
                 entities:
-{% for instance in glances %}
+{% for instance in homeassistant_glances %}
                   - entity: sensor.{{ instance.hostname | replace('.', '_') }}_etc_hosts_used
                     name: {{ instance.name }}
 {% endfor %}
               - type: entities
                 title: Free
                 entities:
-{% for instance in glances %}
+{% for instance in homeassistant_glances %}
                   - entity: sensor.{{ instance.hostname | replace('.', '_') }}_etc_hosts_free
                     name: {{ instance.name }}
 {% endfor %}
-{% for instance in glances %}
+{% for instance in homeassistant_glances %}
           - type: statistics-graph
             title: {{ instance.name }}
             chart_type: line
@@ -109,12 +109,12 @@ views:
     cards:
       - type: vertical-stack
         cards:
-{% for stock in stocks %}
+{% for stock in homeassistant_stocks %}
           - type: tile
             entity: sensor.stock_{{ stock.name | lower | replace(' ','_') }}
             color: green
 {% endfor %}
-{% for fund in funds %}
+{% for fund in homeassistant_funds %}
           - type: tile
             entity: sensor.fund_{{ fund.name | lower | replace(' ','_') }}
             color: green

diff --git a/roles/homeassistant/templates/portfolio.yaml.j2 b/roles/homeassistant/templates/portfolio.yaml.j2
@@ -2,7 +2,7 @@
 - platform: avanza_stock
   scan_interval: 60
   stock:
-{% for stock in stocks %}
+{% for stock in homeassistant_stocks %}
     - id: {{ stock.id }}
       name: Stock {{ stock.name }}
 {% if stock.shares|int != 0 %}
@@ -29,7 +29,7 @@
 - platform: avanza_stock
   scan_interval: 60
   stock:
-{% for fund in funds %}
+{% for fund in homeassistant_funds %}
     - id: {{ fund.id }}
       name: Fund {{ fund.name }}
 {% if fund.shares|float != 0 %}

diff --git a/roles/homeassistant/templates/static.yaml.j2 b/roles/homeassistant/templates/static.yaml.j2
@@ -5,7 +5,7 @@
       minutes: "/1"
   unique_id: {{ 'static.yaml' | hash('sha1') }}
   sensor:
-{% for sensor in static_template_sensors %}
+{% for sensor in homeassistant_static_template_sensors %}
     - name: {{ sensor.name }} {{ sensor.state }}
       unique_id: -{{ sensor.name | lower | replace(' ','-') }}-{{ sensor.state }}
       unit_of_measurement: "{{ sensor.unit_of_measurement }}"

diff --git a/roles/homepage/defaults/main.yaml b/roles/homepage/defaults/main.yaml