Browse Source

Differing instructions for onion only

Bob Mottram 9 years ago
parent
commit
9676af672e
1 changed files with 13 additions and 5 deletions
  1. 13
    5
      src/freedombone

+ 13
- 5
src/freedombone View File

@@ -87,6 +87,7 @@ CONFIGURATION_FILE="${PROJECT_NAME}.cfg"
87 87
 
88 88
 SSH_PORT=2222
89 89
 IRC_PORT=6697
90
+IRC_ONION_PORT=8093
90 91
 
91 92
 # password used for accessing your repo mirrors
92 93
 MY_MIRRORS_PASSWORD=
@@ -7451,9 +7452,9 @@ function install_irc_server {
7451 7452
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
7452 7453
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
7453 7454
     if [[ $ONION_ONLY != 'yes' ]]; then
7454
-        sed -i ":a;N;\$!ba;s/;Ports =.*/;Ports = $IRC_PORT, 9050, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7455
+        sed -i ":a;N;\$!ba;s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7455 7456
     else
7456
-        sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT, 9050, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7457
+        sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7457 7458
     fi
7458 7459
     sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
7459 7460
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
@@ -7489,7 +7490,7 @@ function install_irc_server {
7489 7490
     touch /var/run/ngircd/ngircd.pid
7490 7491
     chown -R irc:irc /var/run/ngircd
7491 7492
 
7492
-    IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT})
7493
+    IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_ONION_PORT})
7493 7494
     if ! grep -q $"IRC onion domain" $COMPLETION_FILE; then
7494 7495
         echo "IRC onion domain:$IRC_ONION_HOSTNAME" >> $COMPLETION_FILE
7495 7496
     fi
@@ -7513,8 +7514,15 @@ function install_irc_server {
7513 7514
         echo '==========' >> /home/$MY_USERNAME/README
7514 7515
         echo $'To connect to your IRC server in irssi:' >> /home/$MY_USERNAME/README
7515 7516
         echo '' >> /home/$MY_USERNAME/README
7516
-        echo "  /server add -auto -ssl $DEFAULTDOMAIN $IRC_PORT" >> /home/$MY_USERNAME/README
7517
-        echo "  /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
7517
+        if [[ $ONION_ONLY != 'yes' ]]; then
7518
+            echo "  irssi" >> /home/$MY_USERNAME/README
7519
+            echo "  /server add -auto -ssl $DEFAULTDOMAIN $IRC_PORT" >> /home/$MY_USERNAME/README
7520
+            echo "  /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
7521
+        else
7522
+            echo "  usetorwith irssi" >> /home/$MY_USERNAME/README
7523
+            echo "  /server add -auto $IRC_ONION_HOSTNAME $IRC_PORT" >> /home/$MY_USERNAME/README
7524
+            echo "  /connect $IRC_ONION_HOSTNAME" >> /home/$MY_USERNAME/README
7525
+        fi
7518 7526
         echo "  /join #${PROJECT_NAME}" >> /home/$MY_USERNAME/README
7519 7527
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
7520 7528
         chmod 600 /home/$MY_USERNAME/README