Fix conflict in changelog
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Patrick Marchand 2021-03-09 12:28:01 -05:00
commit ffd3ff97f1
2 changed files with 2 additions and 1 deletions

View File

@ -31,6 +31,7 @@ The **patch** part changes incrementally at each release.
* minifirewall: change some defaults
* nagios-nrpe: update check_phpfpm_status.pl & install perl dependencies
* redis: use /run instead or /var/run
* redis: escape password in Munin configuration
* bind9: moved logs from /var/log/bind* to /var/log/named/* to fix problems with apparmor
### Fixed

View File

@ -4,5 +4,5 @@
env.title_prefix Instance {{ redis_instance_name }}
env.port {{ redis_port }}
{% if redis_password %}
env.password {{ redis_password }}
env.password {{ redis_password | replace("#", "\#") }}
{% endif %}