Browse Source

Configurable IRC port

Bob Mottram 10 years ago
parent
commit
53938eee2c
1 changed files with 9 additions and 5 deletions
  1. 9
    5
      src/freedombone

+ 9
- 5
src/freedombone View File

67
 CONFIGURATION_FILE="freedombone.cfg"
67
 CONFIGURATION_FILE="freedombone.cfg"
68
 
68
 
69
 SSH_PORT=2222
69
 SSH_PORT=2222
70
+IRC_PORT=6697
70
 
71
 
71
 # parameters used when adding a new domain
72
 # parameters used when adding a new domain
72
 DDNS_PROVIDER="default@freedns.afraid.org"
73
 DDNS_PROVIDER="default@freedns.afraid.org"
749
   fi
750
   fi
750
 
751
 
751
   if [ -f $CONFIGURATION_FILE ]; then
752
   if [ -f $CONFIGURATION_FILE ]; then
753
+      if grep -q "IRC_PORT" $CONFIGURATION_FILE; then
754
+          IRC_PORT=$(grep "IRC_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
755
+      fi
752
       if grep -q "WIFI_CHANNEL" $CONFIGURATION_FILE; then
756
       if grep -q "WIFI_CHANNEL" $CONFIGURATION_FILE; then
753
           WIFI_CHANNEL=$(grep "WIFI_CHANNEL" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
757
           WIFI_CHANNEL=$(grep "WIFI_CHANNEL" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
754
       fi
758
       fi
1685
   echo '<name replace-wildcards="yes">%h IRC</name>' >> /etc/avahi/services/irc.service
1689
   echo '<name replace-wildcards="yes">%h IRC</name>' >> /etc/avahi/services/irc.service
1686
   echo '<service>' >> /etc/avahi/services/irc.service
1690
   echo '<service>' >> /etc/avahi/services/irc.service
1687
   echo '<type>_irc._tcp</type>' >> /etc/avahi/services/irc.service
1691
   echo '<type>_irc._tcp</type>' >> /etc/avahi/services/irc.service
1688
-  echo "<port>6697</port>" >> /etc/avahi/services/irc.service
1692
+  echo "<port>$IRC_PORT</port>" >> /etc/avahi/services/irc.service
1689
   echo '</service>' >> /etc/avahi/services/irc.service
1693
   echo '</service>' >> /etc/avahi/services/irc.service
1690
   echo '</service-group>' >> /etc/avahi/services/irc.service
1694
   echo '</service-group>' >> /etc/avahi/services/irc.service
1691
 
1695
 
5897
       # docker does its own firewalling
5901
       # docker does its own firewalling
5898
       return
5902
       return
5899
   fi
5903
   fi
5900
-  iptables -A INPUT -i eth0 -p tcp --dport 6697  -j ACCEPT
5901
-  iptables -I INPUT -i eth0 -p tcp --dport 1024:65535 --sport 6697 -j ACCEPT
5904
+  iptables -A INPUT -i eth0 -p tcp --dport $IRC_PORT  -j ACCEPT
5905
+  iptables -I INPUT -i eth0 -p tcp --dport 1024:65535 --sport $IRC_PORT -j ACCEPT
5902
   iptables -A INPUT -i eth0 -p tcp --dport 9999 -j ACCEPT
5906
   iptables -A INPUT -i eth0 -p tcp --dport 9999 -j ACCEPT
5903
   save_firewall_settings
5907
   save_firewall_settings
5904
   echo 'configure_firewall_for_irc' >> $COMPLETION_FILE
5908
   echo 'configure_firewall_for_irc' >> $COMPLETION_FILE
8268
   sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
8272
   sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
8269
   sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
8273
   sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
8270
   sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
8274
   sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
8271
-  sed -i 's/;Ports = 6697, 9999/Ports = 6697, 9999/g' /etc/ngircd/ngircd.conf
8275
+  sed -i "s/;Ports =.*/Ports = $IRC_PORT, 9999/g" /etc/ngircd/ngircd.conf
8272
   sed -i 's/;Name = #ngircd/Name = #freedombone/g' /etc/ngircd/ngircd.conf
8276
   sed -i 's/;Name = #ngircd/Name = #freedombone/g' /etc/ngircd/ngircd.conf
8273
   sed -i 's/;Topic = Our ngircd testing channel/Topic = Freedombone chat channel/g' /etc/ngircd/ngircd.conf
8277
   sed -i 's/;Topic = Our ngircd testing channel/Topic = Freedombone chat channel/g' /etc/ngircd/ngircd.conf
8274
   sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
8278
   sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
8301
       echo '==========' >> /home/$MY_USERNAME/README
8305
       echo '==========' >> /home/$MY_USERNAME/README
8302
       echo 'To connect to your IRC server in irssi:' >> /home/$MY_USERNAME/README
8306
       echo 'To connect to your IRC server in irssi:' >> /home/$MY_USERNAME/README
8303
       echo '' >> /home/$MY_USERNAME/README
8307
       echo '' >> /home/$MY_USERNAME/README
8304
-      echo "  /server add -auto -ssl $DEFAULTDOMAIN 6697" >> /home/$MY_USERNAME/README
8308
+      echo "  /server add -auto -ssl $DEFAULTDOMAIN $IRC_PORT" >> /home/$MY_USERNAME/README
8305
       echo "  /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
8309
       echo "  /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
8306
       echo '  /join #freedombone' >> /home/$MY_USERNAME/README
8310
       echo '  /join #freedombone' >> /home/$MY_USERNAME/README
8307
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
8311
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README