ZNC: Update configuration template for znc 1.4

ZNC 1.4 uses a new section within the configuration file to specify
password hash and salt. This requires adding a new Ansible variable
'irc_password_salt'.

Also update the README file to reflect above changes.

README.textile

@@ -147,16 +147,23 @@ bc. python3 -c 'import crypt; print(crypt.crypt("password", salt=crypt.METHOD_SH
 Same for the IRC password hash...
 
 bc. # znc --makepass
+[ ** ] Type your new password.
 [ ?? ] Enter Password: foo
 [ ?? ] Confirm Password: foo
-[ ** ] Use this in the <User> section of your config:
-[ ** ] Pass = sha256#4bfc209c5e19874337fd89c80675ad194836efea5efd4189b7f73cd9e0a6094f#,i*Msa0B;w9yR23nm1ZB#
+[ ** ] Kill ZNC process, if it's running.
+[ ** ] Then replace password in the <User> section of your config with this:
+<Pass password>
+        Method = sha256
+        Hash = 310c5f99825e80d5b1d663a0a993b8701255f16b2f6056f335ba6e3e720e57ed
+        Salt = YdlPM5yjBmc/;JO6cfL5
+</Pass>
+[ ** ] After that start ZNC again, and you should be able to login with the new password.
 
-Take the string beginning with @sha256#@ and insert it as the value for @irc_password_hash@.
+Take the strings after @Hash =@ and @Salt =@ and insert them as the value for @irc_password_hash@ and @irc_password_salt@ respectively.
 
 Alternatively, if you don't already have @znc@ installed, Python 3.3 or higher will generate the appropriate string for you on Unix-based platforms (assuming your password is @password@):
 
-bc. python3 -c 'import crypt; print("sha256#{}#{}".format(*crypt.crypt("password", salt=crypt.METHOD_SHA256).split("$")[2:]))'
+bc. python3 -c 'import crypt; print("irc_password_salt: \"{}\"\nirc_password_hash: \"{}\"".format(*crypt.crypt("password", salt=crypt.METHOD_SHA256).split("$")[2:]))'
 
 For git hosting, copy your public key into place. @cp ~/.ssh/id_rsa.pub roles/git/files/gitolite.pub@ or similar.
 

roles/ircbouncer/templates/var_lib_znc_configs_znc.conf.j2

@@ -64,6 +64,12 @@ Version = 1.0
 	RealName = {{ irc_realname }}
 	TimestampFormat = [%H:%M:%S]
 
+	<Pass password>
+	        Method = sha256
+	        Hash = {{ irc_password_hash }}
+	        Salt = {{ irc_password_salt }}
+	</Pass>
+
 	<Network freenode>
 		BindHost = 0.0.0.0
 		FloodBurst = 4
@@ -74,6 +80,4 @@ Version = 1.0
 		LoadModule = savebuff
 		Server = chat.freenode.net +6697
 	</Network>
-
-	Pass = {{ irc_password_hash }}
 </User>

vars/defaults.yml

@@ -47,6 +47,7 @@ znc_version: 1.4
 # irc_realname: (required)
 # irc_quitmsg: (required)
 # irc_password_hash: (required)
+# irc_password_salt: (required)
 
 # mailserver
 mail_server_hostname: "mail.{{ domain }}"

vars/testing.yml

@@ -19,7 +19,8 @@ irc_nick: sovereign
 irc_ident: sovereign
 irc_realname: Mr. Sovereign
 irc_quitmsg: Bye
-irc_password_hash: "sha256#4bfc209c5e19874337fd89c80675ad194836efea5efd4189b7f73cd9e0a6094f#,i*Msa0B;w9yR23nm1ZB#" #foo
+irc_password_hash: "310c5f99825e80d5b1d663a0a993b8701255f16b2f6056f335ba6e3e720e57ed" #foo
+irc_password_salt: "YdlPM5yjBmc/;JO6cfL5"
 
 # mailserver
 mail_db_password: testPassword

vars/user.yml

@@ -19,6 +19,7 @@ irc_ident: TODO
 irc_realname: TODO
 irc_quitmsg: TODO
 irc_password_hash: TODO
+irc_password_salt: TODO
 
 # mailserver
 mail_db_password: TODO