Merge pull request #6 from blalop/bugs/5

#5 fix password parameter for exporter

Author: blalop

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [1.0.1](https://github.com/blalop/pihole_role/tree/1.0.1) - 2021-07-03
+### Fixed
+* [#5](https://github.com/blalop/pihole_role/issues/5) When no password is provided, skip exporter parameter @blalop
+
 ## [1.0.0](https://github.com/blalop/pihole_role/tree/1.0.0) - 2021-06-30
 ### Added
 * [#3](https://github.com/blalop/pihole_role/issues/3) Allow no password @blalop

defaults/main.yml

@@ -53,8 +53,9 @@ pihole_exporter_private_tmp: yes
 pihole_exporter_documentation_link: https://github.com/eko/pihole-exporter
 pihole_exporter_max_files: 32768
 pihole_exporter_log_output: "{% if pihole_exporter_log_file is defined %} file:{{ pihole_exporter_log_file }} {% else %} journal{% endif %}"
+
 pihole_exporter_options:
   - "port {{ pihole_exporter_port }}"
   - "pihole_hostname {{ pihole_exporter_hostname }}"
-  - "pihole_password {{ pihole_password }}"
   - "pihole_port {{ pihole_lighttpd_port }}"
+  - "{% if pihole_password != '' %}pihole_password {{ pihole_password }}{% endif %}"

templates/pihole_exporter.service.j2

@@ -13,7 +13,7 @@ RuntimeDirectory=pihole_exporter
 LimitNOFILE={{ pihole_exporter_max_files }}
 
 
-ExecStart={{ pihole_exporter_exec_name }} {% for option in pihole_exporter_options %}-{{ option }} {% endfor %}
+ExecStart={{ pihole_exporter_exec_name }} {% for option in pihole_exporter_options %}{% if option != '' %}-{{ option }} {% endif %}{% endfor %}
 
 StandardOutput={{ pihole_exporter_log_output }}
 StandardError={{ pihole_exporter_log_output }}
@@ -22,4 +22,4 @@ KillSignal=SIGTERM
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target