|
@@ -107,8 +107,9 @@ function add_user_irc_bouncer {
|
107
|
107
|
|
108
|
108
|
stop_irc_bouncer
|
109
|
109
|
|
110
|
|
- ZNC_SALT="$(dd if=/dev/urandom bs=16c count=1 | md5sum | awk '{print $1}')"
|
111
|
|
- new_user_hash=$(echo "${new_user_password}${ZNC_SALT}" | sha256sum | awk -F ' ' '{print $1}')
|
|
110
|
+ ZNC_SALT_BASE="$(create_password 30)"
|
|
111
|
+ ZNC_SALT="$(echo \"${ZNC_SALT_BASE}\" | md5sum | awk '{print $1}')"
|
|
112
|
+ new_user_hash=$(echo "${new_user_password}${new_user_salt}" | sha256sum | awk -F ' ' '{print $1}')
|
112
|
113
|
|
113
|
114
|
echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf
|
114
|
115
|
#new_user_pass="sha256#${new_user_hash}#${new_user_salt}#"
|
|
@@ -137,8 +138,8 @@ function add_user_irc_bouncer {
|
137
|
138
|
echo ' LoadModule = perform' >> /home/znc/.znc/configs/znc.conf
|
138
|
139
|
echo ' LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf
|
139
|
140
|
echo '' >> /home/znc/.znc/configs/znc.conf
|
140
|
|
- echo " Server = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf
|
141
|
|
- echo " Server = ${IRC_ONION_HOSTNAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf
|
|
141
|
+ echo " Server = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
|
|
142
|
+ echo " Server = ${IRC_ONION_HOSTNAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
|
142
|
143
|
echo '' >> /home/znc/.znc/configs/znc.conf
|
143
|
144
|
echo " <Chan ${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf
|
144
|
145
|
echo ' </Chan>' >> /home/znc/.znc/configs/znc.conf
|