Pārlūkot izejas kodu

irc onion port same as clearnet port

Bob Mottram 9 gadus atpakaļ
vecāks
revīzija
5074772889
1 mainītis faili ar 3 papildinājumiem un 21 dzēšanām
  1. 3
    21
      src/freedombone

+ 3
- 21
src/freedombone Parādīt failu

90
 
90
 
91
 SSH_PORT=2222
91
 SSH_PORT=2222
92
 IRC_PORT=6697
92
 IRC_PORT=6697
93
-IRC_ONION_PORT=8093
93
+IRC_ONION_PORT=6697
94
 
94
 
95
 # password used for accessing your repo mirrors
95
 # password used for accessing your repo mirrors
96
 MY_MIRRORS_PASSWORD=
96
 MY_MIRRORS_PASSWORD=
6881
         echo "    address = \"${IRC_ONION_HOSTNAME}\";" >> /home/$MY_USERNAME/.irssi/config
6881
         echo "    address = \"${IRC_ONION_HOSTNAME}\";" >> /home/$MY_USERNAME/.irssi/config
6882
         echo "    port = \"${IRC_ONION_PORT}\";" >> /home/$MY_USERNAME/.irssi/config 
6882
         echo "    port = \"${IRC_ONION_PORT}\";" >> /home/$MY_USERNAME/.irssi/config 
6883
         echo '    use_ssl = "no";' >> /home/$MY_USERNAME/.irssi/config
6883
         echo '    use_ssl = "no";' >> /home/$MY_USERNAME/.irssi/config
6884
-        sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
6885
-        systemctl restart ngircd
6886
     fi
6884
     fi
6887
     echo '    chatnet = "Freedombone";' >> /home/$MY_USERNAME/.irssi/config
6885
     echo '    chatnet = "Freedombone";' >> /home/$MY_USERNAME/.irssi/config
6888
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
6886
     echo '    ssl_verify = "no";' >> /home/$MY_USERNAME/.irssi/config
6971
     sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
6969
     sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
6972
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
6970
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
6973
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
6971
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
6972
+    sed -i "s/;Ports =.*/Ports = $IRC_PORT/1" /etc/ngircd/ngircd.conf
6974
     sed -i "s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
6973
     sed -i "s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
6975
-    if [[ $ONION_ONLY != 'yes' ]]; then
6976
-        sed -i "s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
6977
-    else
6978
-        sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
6979
-    fi
6980
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
6974
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
6981
     sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf
6975
     sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf
6982
     sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
6976
     sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
7015
         echo "IRC onion domain:$IRC_ONION_HOSTNAME" >> $COMPLETION_FILE
7009
         echo "IRC onion domain:$IRC_ONION_HOSTNAME" >> $COMPLETION_FILE
7016
     fi
7010
     fi
7017
 
7011
 
7018
-    systemctl stop ngircd
7019
-    if [ ! -f /lib/systemd/system/ngircd.service ]; then
7020
-        echo $'No systemd daemon found for ngircd'
7021
-        exit 82528
7022
-    fi
7023
-    
7024
-    if [[ $ONION_ONLY == 'no' ]]; then
7025
-        sed -i 's|ExecStart.*|ExecStart=/usr/sbin/ngircd|g' /lib/systemd/system/ngircd.service
7026
-    else
7027
-        sed -i 's|ExecStart.*|ExecStart=/usr/bin/torify /usr/sbin/ngircd|g' /lib/systemd/system/ngircd.service
7028
-    fi  
7029
-    systemctl daemon-reload
7030
-    systemctl start ngircd
7012
+    systemctl restart ngircd
7031
 
7013
 
7032
     # keep the daemon running
7014
     # keep the daemon running
7033
     echo '' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
7015
     echo '' >> /usr/bin/$WATCHDOG_SCRIPT_NAME