Bläddra i källkod

Connect to the local irc server

Bob Mottram 8 år sedan
förälder
incheckning
e806fc4dff
1 ändrade filer med 5 tillägg och 9 borttagningar
  1. 5
    9
      src/freedombone-app-irc

+ 5
- 9
src/freedombone-app-irc Visa fil

138
     echo '        LoadModule = chansaver' >> /home/znc/.znc/configs/znc.conf
138
     echo '        LoadModule = chansaver' >> /home/znc/.znc/configs/znc.conf
139
     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf
139
     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf
140
     echo '' >> /home/znc/.znc/configs/znc.conf
140
     echo '' >> /home/znc/.znc/configs/znc.conf
141
-    echo "        Server     = ${DEFAULT_DOMAIN_NAME} ${IRC_PORT} ${IRC_PASSWORD}" >> /home/znc/.znc/configs/znc.conf
142
-    #echo "        Server     = ${IRC_ONION_HOSTNAME} ${IRC_PORT} ${IRC_PASSWORD}" >> /home/znc/.znc/configs/znc.conf
141
+    echo "        Server     = 127.0.0.1 ${IRC_PORT} ${IRC_PASSWORD}" >> /home/znc/.znc/configs/znc.conf
143
     echo '' >> /home/znc/.znc/configs/znc.conf
142
     echo '' >> /home/znc/.znc/configs/znc.conf
144
     echo "        <Chan #${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf
143
     echo "        <Chan #${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf
145
     echo '        </Chan>' >> /home/znc/.znc/configs/znc.conf
144
     echo '        </Chan>' >> /home/znc/.znc/configs/znc.conf
308
             sed -i "s|Salt = .*|Salt = ${ZNC_SALT}|g" /home/znc/.znc/configs/znc.conf
307
             sed -i "s|Salt = .*|Salt = ${ZNC_SALT}|g" /home/znc/.znc/configs/znc.conf
309
 
308
 
310
             # change the server password
309
             # change the server password
311
-            sed -i "s|Server     = ${DEFAULT_DOMAIN_NAME}.*|Server     = ${DEFAULT_DOMAIN_NAME} ${IRC_PORT} ${NEW_IRC_PASSWORD}|g" /home/znc/.znc/configs/znc.conf
310
+            sed -i "s|Server     = 127.0.0.1.*|Server     = 127.0.0.1 ${IRC_PORT} ${NEW_IRC_PASSWORD}|g" /home/znc/.znc/configs/znc.conf
312
 
311
 
313
             # Update the password in the readme
312
             # Update the password in the readme
314
             sed -i "s|IRC login password.*|IRC login password: $NEW_IRC_PASSWORD|g" /home/$MY_USERNAME/README
313
             sed -i "s|IRC login password.*|IRC login password: $NEW_IRC_PASSWORD|g" /home/$MY_USERNAME/README
557
     echo '    autoconnect = "no";' >> /home/${MY_USERNAME}/.irssi/config
556
     echo '    autoconnect = "no";' >> /home/${MY_USERNAME}/.irssi/config
558
     echo '  },' >> /home/${MY_USERNAME}/.irssi/config
557
     echo '  },' >> /home/${MY_USERNAME}/.irssi/config
559
     echo '  {' >> /home/${MY_USERNAME}/.irssi/config
558
     echo '  {' >> /home/${MY_USERNAME}/.irssi/config
559
+    echo "    address = \"127.0.0.1\";" >> /home/${MY_USERNAME}/.irssi/config
560
+    echo '    use_ssl = "no";' >> /home/${MY_USERNAME}/.irssi/config
561
+    echo '    ssl_verify = "no";' >> /home/${MY_USERNAME}/.irssi/config
560
     if [[ ${ONION_ONLY} == 'no' ]]; then
562
     if [[ ${ONION_ONLY} == 'no' ]]; then
561
-        echo "    address = \"${DEFAULT_DOMAIN_NAME}\";" >> /home/${MY_USERNAME}/.irssi/config
562
         echo "    port = \"${IRC_BOUNCER_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
563
         echo "    port = \"${IRC_BOUNCER_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
563
-        echo '    use_ssl = "yes";' >> /home/${MY_USERNAME}/.irssi/config
564
-        echo '    ssl_verify = "yes";' >> /home/${MY_USERNAME}/.irssi/config
565
     else
564
     else
566
         IRC_ONION_HOSTNAME=$(cat ${COMPLETION_FILE} | grep "irc onion domain" | head -n 1 | awk -F ':' '{print $2}')
565
         IRC_ONION_HOSTNAME=$(cat ${COMPLETION_FILE} | grep "irc onion domain" | head -n 1 | awk -F ':' '{print $2}')
567
-        echo "    address = \"127.0.0.1\";" >> /home/${MY_USERNAME}/.irssi/config
568
         echo "    port = \"${IRC_ONION_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
566
         echo "    port = \"${IRC_ONION_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
569
-        echo '    use_ssl = "no";' >> /home/${MY_USERNAME}/.irssi/config
570
-        echo '    ssl_verify = "no";' >> /home/${MY_USERNAME}/.irssi/config
571
     fi
567
     fi
572
     echo '    chatnet = "Freedombone";' >> /home/${MY_USERNAME}/.irssi/config
568
     echo '    chatnet = "Freedombone";' >> /home/${MY_USERNAME}/.irssi/config
573
     echo '    autoconnect = "yes";' >> /home/${MY_USERNAME}/.irssi/config
569
     echo '    autoconnect = "yes";' >> /home/${MY_USERNAME}/.irssi/config