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