| 
				
			 | 
			
			
				@@ -107,39 +107,45 @@ 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 -F ' ' '{print $1}' | cut -c1-20)" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				110
			 | 
			
			
				+    #ZNC_SALT="$(dd if=/dev/urandom bs=16c count=1 | md5sum | awk -F ' ' '{print $1}' | cut -c1-20)" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				111
			 | 
			
			
				+    ZNC_SALT='WggsZXvdAmVy4_cu4,_*' 
			 | 
		
	
		
			
			| 
				111
			 | 
			
				112
			 | 
			
			
				     new_user_hash=$(echo "${new_user_password}${ZNC_SALT}" | sha256sum | awk -F ' ' '{print $1}') 
			 | 
		
	
		
			
			| 
				112
			 | 
			
				113
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				113
			 | 
			
				114
			 | 
			
			
				     echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				114
			 | 
			
				
			 | 
			
			
				-    echo '    <Pass password>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				115
			 | 
			
				
			 | 
			
			
				-    echo '        Method = sha256' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				116
			 | 
			
				
			 | 
			
			
				-    echo "        Hash = ${new_user_hash}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				117
			 | 
			
				
			 | 
			
			
				-    echo "        Salt = ${ZNC_SALT}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				118
			 | 
			
				
			 | 
			
			
				-    echo '    </Pass>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				119
			 | 
			
				115
			 | 
			
			
				     echo "    Admin      = ${is_admin}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				120
			 | 
			
				
			 | 
			
			
				-    echo '    Allow      = *' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				121
			 | 
			
				
			 | 
			
			
				-    echo "    Nick       = ${new_username}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				122
			 | 
			
				
			 | 
			
			
				-    echo "    AltNick    = ${new_username}_" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				123
			 | 
			
				
			 | 
			
			
				-    echo "    Ident      = ${new_username}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				124
			 | 
			
				
			 | 
			
			
				-    echo "    RealName   = ${new_username}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				125
			 | 
			
				
			 | 
			
			
				-    echo "    Buffer     = $IRC_BUFFER_LENGTH" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				116
			 | 
			
			
				+    echo "    AltNick = ${new_username}_" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				117
			 | 
			
			
				+    echo '    AppendTimestamp = false' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				126
			 | 
			
				118
			 | 
			
			
				     echo '    AutoClearChanBuffer = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				127
			 | 
			
				
			 | 
			
			
				-    echo '    ChanModes  = +stn' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				128
			 | 
			
				
			 | 
			
			
				-    echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				119
			 | 
			
			
				+    echo '    AutoClearQueryBuffer = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				120
			 | 
			
			
				+    echo '    Buffer = 100' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				121
			 | 
			
			
				+    echo '    DenyLoadMod = false' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				122
			 | 
			
			
				+    echo '    DenySetBindHost = false' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				123
			 | 
			
			
				+    echo "    Ident = ${new_username}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				124
			 | 
			
			
				+    echo '    JoinTries = 10' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				129
			 | 
			
				125
			 | 
			
			
				     echo '    LoadModule = chansaver' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				130
			 | 
			
				126
			 | 
			
			
				     echo '    LoadModule = controlpanel' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				127
			 | 
			
			
				+    echo '    MaxJoins = 10' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				128
			 | 
			
			
				+    echo '    MaxNetworks = 10' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				129
			 | 
			
			
				+    echo '    MaxQueryBuffers = 50' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				130
			 | 
			
			
				+    echo '    MultiClients = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				131
			 | 
			
			
				+    echo "    Nick = ${new_username}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				132
			 | 
			
			
				+    echo '    PrependTimestamp = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				133
			 | 
			
			
				+    echo '    QuitMsg = Bye' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				134
			 | 
			
			
				+    echo "    RealName = ${new_username}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				135
			 | 
			
			
				+    echo '    StatusPrefix = *' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				136
			 | 
			
			
				+    echo '    TimestampFormat = [%H:%M:%S]' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				131
			 | 
			
				137
			 | 
			
			
				     echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				132
			 | 
			
				138
			 | 
			
			
				     echo "    <Network ${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				133
			 | 
			
				139
			 | 
			
			
				     echo '        LoadModule = chansaver' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				134
			 | 
			
				140
			 | 
			
			
				     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				135
			 | 
			
				141
			 | 
			
			
				     echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				136
			 | 
			
				
			 | 
			
			
				-    echo "        Server     = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				137
			 | 
			
				
			 | 
			
			
				-    echo "        Server     = ${IRC_ONION_HOSTNAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				142
			 | 
			
			
				+    echo "        Server     = ${DEFAULT_DOMAIN_NAME} ${IRC_PORT} ${IRC_PASSWORD}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				143
			 | 
			
			
				+    echo "        Server     = ${IRC_ONION_HOSTNAME} ${IRC_PORT} ${IRC_PASSWORD}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				138
			 | 
			
				144
			 | 
			
			
				     echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				139
			 | 
			
				
			 | 
			
			
				-    echo "        <Chan ${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				145
			 | 
			
			
				+    echo "        <Chan #${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				140
			 | 
			
				146
			 | 
			
			
				     echo '        </Chan>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				141
			 | 
			
				147
			 | 
			
			
				     echo '    </Network>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				142
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				
			 | 
			
				148
			 | 
			
			
				+    echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				143
			 | 
			
				149
			 | 
			
			
				     echo '    <Network oftc>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				144
			 | 
			
				150
			 | 
			
			
				     echo '        LoadModule = chansaver' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				145
			 | 
			
				151
			 | 
			
			
				     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -148,7 +154,7 @@ function add_user_irc_bouncer { 
			 | 
		
	
		
			
			| 
				148
			 | 
			
				154
			 | 
			
			
				     echo '        IRCConnectEnabled = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				149
			 | 
			
				155
			 | 
			
			
				     echo '        Server = irc.oftc.net 6697' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				150
			 | 
			
				156
			 | 
			
			
				     echo '    </Network>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				151
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				
			 | 
			
				157
			 | 
			
			
				+    echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				152
			 | 
			
				158
			 | 
			
			
				     echo '    <Network freenode>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				153
			 | 
			
				159
			 | 
			
			
				     echo '        LoadModule = chansaver' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				154
			 | 
			
				160
			 | 
			
			
				     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -157,7 +163,12 @@ function add_user_irc_bouncer { 
			 | 
		
	
		
			
			| 
				157
			 | 
			
				163
			 | 
			
			
				     echo '        IRCConnectEnabled = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				158
			 | 
			
				164
			 | 
			
			
				     echo '        Server = irc.freenode.net 6697' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				159
			 | 
			
				165
			 | 
			
			
				     echo '    </Network>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				160
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				
			 | 
			
				166
			 | 
			
			
				+    echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				167
			 | 
			
			
				+    echo '    <Pass password>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				168
			 | 
			
			
				+    echo "        Hash = ${new_user_hash}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				169
			 | 
			
			
				+    echo '        Method = sha256' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				170
			 | 
			
			
				+    echo "        Salt = ${ZNC_SALT}" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				171
			 | 
			
			
				+    echo '    </Pass>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				161
			 | 
			
				172
			 | 
			
			
				     echo '</User>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				162
			 | 
			
				173
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				163
			 | 
			
				174
			 | 
			
			
				     mkdir -p /home/znc/.znc/users/${new_username}/moddata 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -589,14 +600,25 @@ function install_irc_bouncer { 
			 | 
		
	
		
			
			| 
				589
			 | 
			
				600
			 | 
			
			
				     mkdir -p /home/znc/.znc/configs 
			 | 
		
	
		
			
			| 
				590
			 | 
			
				601
			 | 
			
			
				     mkdir -p /home/znc/.znc/users 
			 | 
		
	
		
			
			| 
				591
			 | 
			
				602
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				592
			 | 
			
				
			 | 
			
			
				-    echo 'Version = 1.6.2' > /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				593
			 | 
			
				
			 | 
			
			
				-    echo '<Listener l>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				594
			 | 
			
				
			 | 
			
			
				-    echo "    Port = $IRC_BOUNCER_PORT" >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				595
			 | 
			
				
			 | 
			
			
				-    echo '    IPv4 = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				596
			 | 
			
				
			 | 
			
			
				-    echo '    IPv6 = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				597
			 | 
			
				
			 | 
			
			
				-    echo '    SSL = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				603
			 | 
			
			
				+    echo 'AnonIPLimit = 10' > /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				604
			 | 
			
			
				+    echo 'ConnectDelay = 5' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				605
			 | 
			
			
				+    echo 'HideVersion = false' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				606
			 | 
			
			
				+    echo 'MaxBufferSize = 500' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				607
			 | 
			
			
				+    echo 'ProtectWebSessions = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				608
			 | 
			
			
				+    echo 'SSLCertFile = /home/znc/.znc/znc.pem' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				609
			 | 
			
			
				+    echo 'ServerThrottle = 30' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				610
			 | 
			
			
				+    echo 'Version = 1.6.2' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				611
			 | 
			
			
				+    echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				612
			 | 
			
			
				+    echo '<Listener listener0>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				613
			 | 
			
			
				+    echo '  AllowIRC = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				614
			 | 
			
			
				+    echo '  AllowWeb = false' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				615
			 | 
			
			
				+    echo '  IPv4 = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				616
			 | 
			
			
				+    echo '  IPv6 = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				617
			 | 
			
			
				+    echo '  Port = 6697' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				618
			 | 
			
			
				+    echo '  SSL = true' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				619
			 | 
			
			
				+    echo '  URIPrefix = /' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				598
			 | 
			
				620
			 | 
			
			
				     echo '</Listener>' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				599
			 | 
			
				
			 | 
			
			
				-    echo 'LoadModule = webadmin' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				
			 | 
			
				621
			 | 
			
			
				+    echo '' >> /home/znc/.znc/configs/znc.conf 
			 | 
		
	
		
			
			| 
				600
			 | 
			
				622
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				601
			 | 
			
				623
			 | 
			
			
				     chown -R znc:znc /home/znc/.znc 
			 | 
		
	
		
			
			| 
				602
			 | 
			
				624
			 | 
			
			
				  
			 |