瀏覽代碼

Set users up with the current IRC password

Bob Mottram 9 年之前
父節點
當前提交
6f5bb61ae4
共有 2 個文件被更改,包括 10 次插入2 次删除
  1. 4
    1
      src/freedombone
  2. 6
    1
      src/freedombone-adduser

+ 4
- 1
src/freedombone 查看文件

7262
     echo '    use_ssl = "yes";' >> /home/$MY_USERNAME/.irssi/config
7262
     echo '    use_ssl = "yes";' >> /home/$MY_USERNAME/.irssi/config
7263
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
7263
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
7264
     echo '    autoconnect = "yes";' >> /home/$MY_USERNAME/.irssi/config
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
     echo '  }' >> /home/$MY_USERNAME/.irssi/config
7268
     echo '  }' >> /home/$MY_USERNAME/.irssi/config
7266
     echo ');' >> /home/$MY_USERNAME/.irssi/config
7269
     echo ');' >> /home/$MY_USERNAME/.irssi/config
7267
     echo '' >> /home/$MY_USERNAME/.irssi/config
7270
     echo '' >> /home/$MY_USERNAME/.irssi/config
10836
 install_tox_client
10839
 install_tox_client
10837
 tox_avahi
10840
 tox_avahi
10838
 configure_firewall_for_xmpp
10841
 configure_firewall_for_xmpp
10839
-install_irc_client
10840
 install_irc_server
10842
 install_irc_server
10841
 configure_firewall_for_irc
10843
 configure_firewall_for_irc
10844
+install_irc_client
10842
 install_voip
10845
 install_voip
10843
 install_sip
10846
 install_sip
10844
 update_sipwitch_daemon
10847
 update_sipwitch_daemon

+ 6
- 1
src/freedombone-adduser 查看文件

306
     if grep -q "IRC_PORT" $CONFIGURATION_FILE; then
306
     if grep -q "IRC_PORT" $CONFIGURATION_FILE; then
307
         IRC_PORT=$(grep "IRC_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
307
         IRC_PORT=$(grep "IRC_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
308
     fi
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
     if [ ! -d /home/$MY_USERNAME/.irssi ]; then
314
     if [ ! -d /home/$MY_USERNAME/.irssi ]; then
311
         mkdir /home/$MY_USERNAME/.irssi
315
         mkdir /home/$MY_USERNAME/.irssi
312
     fi
316
     fi
331
     echo '    use_ssl = "yes";' >> /home/$MY_USERNAME/.irssi/config
335
     echo '    use_ssl = "yes";' >> /home/$MY_USERNAME/.irssi/config
332
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
336
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
333
     echo '    autoconnect = "yes";' >> /home/$MY_USERNAME/.irssi/config
337
     echo '    autoconnect = "yes";' >> /home/$MY_USERNAME/.irssi/config
338
+    
334
     echo '  }' >> /home/$MY_USERNAME/.irssi/config
339
     echo '  }' >> /home/$MY_USERNAME/.irssi/config
335
     echo ');' >> /home/$MY_USERNAME/.irssi/config
340
     echo ');' >> /home/$MY_USERNAME/.irssi/config
336
     echo '' >> /home/$MY_USERNAME/.irssi/config
341
     echo '' >> /home/$MY_USERNAME/.irssi/config