Merge pull request #4 from blalop/features/3

Features/3

Author: blalop

.ansible-lint

@@ -4,5 +4,6 @@ exclude_paths:
 parseable: true
 skip_list:
   - '204'
+  - '208'
 use_default_rules: true
 verbosity: 1

CHANGELOG.md

@@ -0,0 +1,35 @@
+# Change Log
+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.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
+### Breaking :warning:
+* For password changing, pihole_force_reinstall has to be set to true @blalop
+* No password configured by default @blalop
+
+## [0.4.0](https://github.com/blalop/pihole_role/tree/0.4.0) - 2021-02-27
+### Added
+* [#1](https://github.com/blalop/pihole_role/issues/1) Support for pihole exporter @blalop
+
+## [0.3.2](https://github.com/blalop/pihole_role/tree/0.3.2) - 2021-01-23
+### Added
+* Also tag installation checks @blalop
+
+## [0.3.1](https://github.com/blalop/pihole_role/tree/0.3.1) - 2021-01-22
+### Fixed
+* Fixed password setting idempotence @blalop
+
+## [0.3.0](https://github.com/blalop/pihole_role/tree/0.3.0) - 2021-01-21
+### Added
+* Added password setting support @blalop
+
+## [0.2.0](https://github.com/blalop/pihole_role/tree/0.2.0) - 2021-01-16
+### Added
+* Use /tmp when downloading install script @blalop
+* Don't copy the lighttpd conf when it's not being installed @blalop
+
+## [0.1.0](https://github.com/blalop/pihole_role/tree/0.1.0) - 2021-01-16
+### Added
+* Initial release @blalop

Pipfile

@@ -4,10 +4,12 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-ansible = "==2.9.16"
-molecule = "==3.2.2"
+ansible = "==4.0.0"
+molecule = "==3.3.2"
+docker = "==5.0.0"
+ansible-lint = "==5.0.9"
 molecule-docker = "==0.2.4"
-ansible-lint = "==4.3.7"
+yamllint = "==1.26.1"
 
 [dev-packages]
 

Pipfile.lock

@@ -6,7 +6,7 @@ pihole_required_packages:
 
 pihole_force_reinstall: false
 
-pihole_password: pihole
+pihole_password: ""
 
 ## Lighttpd config
 pihole_lighttpd_port: 80

defaults/main.yml

@@ -5,6 +5,7 @@ driver:
   name: docker
 lint: |
   yamllint .
+  ansible-lint .
 platforms:
   - name: pihole
     groups:

molecule/default/molecule.yml

@@ -6,15 +6,3 @@
     dest: /etc/lighttpd/lighttpd.conf
   notify: restart pihole_lighttpd
   when: pihole_web_server
-
-- name: Pi-hole | Check current password hash
-  command: grep -oP 'WEBPASSWORD=\K\w+' /etc/pihole/setupVars.conf
-  changed_when: false
-  ignore_errors: true
-  register: pihole_current_password_hash
-
-- name: Pi-hole | Set password
-  command: "pihole -a -p {{ pihole_password }}"
-  changed_when: true
-  when: pihole_password | length > 0 and
-        pihole_password | hash('sha256') | hash('sha256') != pihole_current_password_hash.stdout

tasks/config.yml

@@ -24,3 +24,4 @@
 
 - name: Pi-hole | Run install script
   command: /tmp/pihole-install.sh --unattended
+  changed_when: true

tasks/install.yml

@@ -7,3 +7,4 @@ QUERY_LOGGING={{ pihole_query_logging | lower }}
 INSTALL_WEB_SERVER={{ pihole_web_server | lower }}
 INSTALL_WEB_INTERFACE={{ pihole_web_interface | lower }}
 LIGHTTPD_ENABLED={{ pihole_lighttpd_enabled | lower }}
+WEBPASSWORD={{ '' if pihole_password == '' else pihole_password | hash('sha256') | hash('sha256') }}