Fix redis/icingadb config

Author: Saeid Hassan-Abadi

roles/icingadb/templates/icingadb.ini.j2

@@ -31,9 +31,8 @@ database:
 redis:
   host: {{ icingadb_redis_host }}
 {% if icingadb_redis_tls is defined %}
-  port: 0
-  tls-port: {{ icingadb_redis_tls_port | default(6380) }}
-{% elif icingadb_redis_port is defined %}
+  port: {{ icingadb_redis_tls_port | default(icingadb_redis_port) }}
+{% else %}
   port: {{ icingadb_redis_port }}
 {% endif %}
 {% if icingadb_redis_password is defined %}

roles/icingadb_redis/templates/icingadb-redis.conf.j2

@@ -6,9 +6,11 @@ bind {% for host in icingadb_redis_binds %}
 {% endfor %}
 
 protected-mode {{ icingadb_redis_protected_mode | string }}
-port {{ icingadb_redis_port }}
-{% if icingadb_redis_tls_port is defined %}
-tls-port {{ icingadb_redis_tls_port }}
+{% if icingadb_redis_tls is defined %}
+port: 0
+tls-port: {{ icingadb_redis_tls_port | default(icingadb_redis_port) }}
+{% else %}
+port: {{ icingadb_redis_port }}
 {% endif %}
 tcp-backlog {{ icingadb_redis_tcp_backlog }}
 timeout {{ icingadb_redis_timeout }}