Simplify configuration file management

roles/ipmi_exporter/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 ipmi_exporter_version: 1.10.1
 ipmi_exporter_dir: "/etc/exporters"
-ipmi_exporter_config_dir: "/etc/exporters/config"
+ipmi_exporter_config_dir: "/etc/ipmi_exporter"
 ipmi_exporter_log_level: "info"
 ipmi_exporter_log_format: "logfmt"
 ipmi_exporter_web_listen_address: "localhost:9290"

roles/ipmi_exporter/molecule/default/converge.yml

@@ -3,4 +3,4 @@
   hosts: all
   roles:
     - role: genlab.common.ipmi_exporter
-      ipmi_exporter_source_dir: "molecule/default/"
+      ipmi_exporter_config_dir: "molecule/default/"

roles/ipmi_exporter/tasks/configure.yml

@@ -1,20 +1,20 @@
 ---
 - name: "Configure | Upload local configuration file"
   notify: "(Re)start and enable ipmi_exporter"
-  when: ipmi_exporter_source_dir is defined and ipmi_exporter_source_dir | length > 0
+  when: ipmi_exporter_local_conf is defined
   ansible.builtin.template:
-    src: "{{ ipmi_exporter_source_dir }}/ipmi_local.conf"
+    src: "{{ ipmi_exporter_local_conf }}"
-    dest: "{{ ipmi_exporter_config_dir }}/ipmi_local.conf"
+    dest: "{{ ipmi_exporter_config_dir }}/local.conf"
     owner: root
     group: root
     mode: '0640'
 
 - name: "Configure | Upload web configuration file"
   notify: "(Re)start and enable ipmi_exporter"
-  when: ipmi_exporter_web_source_dir is defined and ipmi_exporter_web_source_dir | length > 0
+  when: ipmi_exporter_web_conf is defined
   ansible.builtin.template:
-    src: "{{ ipmi_exporter_web_source_dir }}/web_conf.yaml"
+    src: "{{ ipmi_exporter_web_conf }}"
-    dest: "{{ ipmi_exporter_config_dir }}/web_conf.yaml"
+    dest: "{{ ipmi_exporter_config_dir }}/web.yaml"
     owner: root
     group: root
     mode: '0640'

roles/ipmi_exporter/tasks/install.yml

@@ -16,7 +16,6 @@
   rescue:
     - name: "Install | Create directories"
       loop:
-        - "{{ ipmi_exporter_dir }}"
         - "{{ ipmi_exporter_config_dir }}"
       ansible.builtin.file:
         path: "{{ item }}"

roles/ipmi_exporter/templates/ipmi_exporter.service.j2

@@ -14,11 +14,11 @@ ExecStart=/usr/local/bin/ipmi_exporter \
 {% if ipmi_exporter_args is defined and ipmi_exporter_args | length > 0 %}
       {{ ipmi_exporter_args }} \
 {% endif %}
-{% if ipmi_exporter_source_dir is defined and ipmi_exporter_source_dir | length > 0 %}
+{% if ipmi_exporter_local_conf is defined %}
-    --config.file={{ ipmi_exporter_config_dir }}/ipmi_local.conf \
+    --config.file={{ ipmi_exporter_config_dir }}/local.conf \
 {% endif %}
-{% if ipmi_exporter_web_source_dir is defined and ipmi_exporter_web_source_dir | length > 0 %}
+{% if ipmi_exporter_web_conf is defined %}
-    --web.config.file={{ ipmi_exporter_config_dir }}/web_conf.yaml
+    --web.config.file={{ ipmi_exporter_config_dir }}/web.yaml
 {% endif %}
 
 SyslogIdentifier=ipmi_exporter