From ca8703974ede3950eaed0589dc55b7e606224f98 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Sat, 17 Mar 2018 13:50:11 +0800
Subject: znc: Add filter znc_makepass, improve templating with ipv4+ipv6

---
 roles/znc/templates/znc.conf.j2 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'roles/znc')

diff --git a/roles/znc/templates/znc.conf.j2 b/roles/znc/templates/znc.conf.j2
index 71f3495..a45aa89 100644
--- a/roles/znc/templates/znc.conf.j2
+++ b/roles/znc/templates/znc.conf.j2
@@ -34,8 +34,16 @@ SSLCertFile = {{ znc.data_dir }}/znc.allinone.pem
 <Listener {{ listener }}>
     AllowIRC = true
     AllowWeb = false
-    IPv4 = {% if listener == "ipv4" %}true{% else %}false{% endif %}
-    IPv6 = {% if listener == "ipv6" %}true{% else %}false{% endif %}
+    IPv4 = {% if listener == "ipv4" -%}
+        true
+    {% else -%}
+        false
+    {% endif -%}
+    IPv6 = {% if listener == "ipv6" -%}
+        true
+    {% else -%}
+        false
+    {% endif -%}
     Port = {{ znc.port }}
     SSL = true
 </Listener>
@@ -43,7 +51,7 @@ SSLCertFile = {{ znc.data_dir }}/znc.allinone.pem
 
 <User {{ znc.username }}>
     Admin = true
-    Pass = {{ znc.password }}
+    Pass = {{ znc.password | znc_makepass }}
     Nick = {{ znc.username }}
     AltNick = {{ znc.username }}_
     Ident = {{ znc.username }}
-- 
cgit v1.2.2