Browse Source

Set users up with the current IRC password

Bob Mottram 9 years ago
parent
commit
6f5bb61ae4
2 changed files with 10 additions and 2 deletions
  1. 4
    1
      src/freedombone
  2. 6
    1
      src/freedombone-adduser

+ 4
- 1
src/freedombone View File

@@ -7262,6 +7262,9 @@ function install_irc_client {
7262 7262
     echo '    use_ssl = "yes";' >> /home/$MY_USERNAME/.irssi/config
7263 7263
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
7264 7264
     echo '    autoconnect = "yes";' >> /home/$MY_USERNAME/.irssi/config
7265
+	if [ $IRC_PASSWORD ]; then
7266
+		echo "    password = \"${IRC_PASSWORD}\";" >> /home/$MY_USERNAME/.irssi/config
7267
+	fi
7265 7268
     echo '  }' >> /home/$MY_USERNAME/.irssi/config
7266 7269
     echo ');' >> /home/$MY_USERNAME/.irssi/config
7267 7270
     echo '' >> /home/$MY_USERNAME/.irssi/config
@@ -10836,9 +10839,9 @@ install_tox_node
10836 10839
 install_tox_client
10837 10840
 tox_avahi
10838 10841
 configure_firewall_for_xmpp
10839
-install_irc_client
10840 10842
 install_irc_server
10841 10843
 configure_firewall_for_irc
10844
+install_irc_client
10842 10845
 install_voip
10843 10846
 install_sip
10844 10847
 update_sipwitch_daemon

+ 6
- 1
src/freedombone-adduser View File

@@ -306,7 +306,11 @@ if grep -q "install_irc_client" $COMPLETION_FILE; then
306 306
     if grep -q "IRC_PORT" $CONFIGURATION_FILE; then
307 307
         IRC_PORT=$(grep "IRC_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
308 308
     fi
309
-
309
+    IRC_PASSWORD=$(cat /etc/ngircd/ngircd.conf | grep "Password =" | head -n 1 | awk -F '=' '{print $2}')       
310
+    if [ ${#IRC_PASSWORD} -lt 2 ]; then
311
+        IRC_PASSWORD=
312
+    fi
313
+    
310 314
     if [ ! -d /home/$MY_USERNAME/.irssi ]; then
311 315
         mkdir /home/$MY_USERNAME/.irssi
312 316
     fi
@@ -331,6 +335,7 @@ if grep -q "install_irc_client" $COMPLETION_FILE; then
331 335
     echo '    use_ssl = "yes";' >> /home/$MY_USERNAME/.irssi/config
332 336
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
333 337
     echo '    autoconnect = "yes";' >> /home/$MY_USERNAME/.irssi/config
338
+    
334 339
     echo '  }' >> /home/$MY_USERNAME/.irssi/config
335 340
     echo ');' >> /home/$MY_USERNAME/.irssi/config
336 341
     echo '' >> /home/$MY_USERNAME/.irssi/config