From 34a576923b60f8b1cdc6a675f0b9ccc90f5cf577 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 6 Jan 2016 14:52:34 +0000 Subject: [PATCH] We probably don't need port 9999 for irc --- doc/EN/installation.org | 1 - man/freedombone.1.gz | Bin 5331 -> 5327 bytes src/freedombone | 6 ++---- website/EN/installation.html | 7 +------ 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/doc/EN/installation.org b/doc/EN/installation.org index 89dad393..1a755455 100644 --- a/doc/EN/installation.org +++ b/doc/EN/installation.org @@ -181,7 +181,6 @@ On your internet router, typically under firewall settings, open the following p | XMPP | 5269 | | XMPP | 5280..5281 | | IRC | 6697 | -| IRC | 9999 | | Git | 9418 | | Email | 25 | | Email | 587 | diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz index ecb22417046262477b16642a68c10592bbccad35..0208e2fb197382edeff9e73ee140582ee6fe81cc 100644 GIT binary patch delta 1272 zcmV0A2Zs-TZ6m!;i5ow>eZAW@9{U#?orHGYJ>U3l_m}4z z-@gCO$PXX7bMobG*ZBVJFK@aH-GDtsjc?w(ecMetxjLD~M|u0|6$!!lALz)@_2l#M zbchU-Av&r_hMU(JztG^DI8HYtauf|G%akPZbFUB_0^YSKNk|WZy zUIt_#%U1>Z&KTOdl)wgZz6I<*; zID$7l3(%D;x?8hSXNt0kUZtxBxVp#}(}ZVf2)5=gRvz;XCsDfkq$DMJx5L%5v)fP8 zXhuKV1R+0ZD%-el=J76T>lu81O*IimREE8^{7z*cmmnOezenWcog;Oe0LF#qw$4dC zyGZY{neb!<$v~9*lW^Z#72vrQF}YEL@Nv~Mox;ezp3$sC;Z=5>jsf;8b(piwiD zKx-N;<5LyqYZ2S+Gf4Li#y__5rbC4qO)BTRKa+yZ)Vb~w<$zCNNqpUo6scRtor z`{2TmXrBO)t#Ck^o!?7;TYA`F8fGNY_Nh2^;-?REj+Nuvd8hyxPwPs`RmkL0e&j$( z8PXQ+RYLCIY20w2>&>R_jn;5HnC4U)4_k9wk)AMhCFGcVMz;8rwUS59aoi}Y5enAo zPX_N$rhS6o6-Sr6nNt0TV1X|1Wxb|{lGrGxj*>LFpi+OnwEU7LSqrMk6X+p1 zsJ9szw=pulObJ24st5OK5W8A$6pV46Ii+UZYav%*bxlTp{jE`?L;v86%a=3- zAbRl_c)#cfmrDrz-~IomfO|#26ijmQKIL>KiK^O}?ofqqc3u7S$)_nkr|C;0@G5t| z0$zlaGQ4N=rh2tMoqoBzJ_2>T>e442G7%BQtPKF~Do4?~ESI>s&5*{Q%-;rGUBO!z zl@N%Jtvf}3^pZSI@!Vx!m*jc%ZYFVCPi1k=EsxG87nAAD@io1jy7_o4reE>b`H&tP z$c¥2n9em`yvy(N!NLO?StLuv_7^7QbWC+PVjoZIWI{x~>fRrx1$`SE?BQ(6;Zu;{eltEH@P-K?c-97ooTc&&Tb_yfCR$L8D8u*#C iH1j`nvAUfD{<#{HTogM39#@l@6fy`1yB=x(H2?rmn~W#` delta 1260 zcmVL~HNJoQ%bRXPH=tHgt}L26QEh?nAtJ z?Do?%n$gcT0Ut=3$~G?6c`(d>+F}RaVNJvl)o5=mKVlikCD=&nFBv(r=P({;hjCT9 zErL?djt00?C%k7trVu4YT{d6#0TT1|Kr zIM$3L(3(a|2UW$%TttQY^wK?&@h`Ew=};9%lgjyG(4?R`b*{TCI^a{7k`Oe@XEVij zp^x>{zQ!;l+9yC{D;$u2X6MJ$mR>!WhUtp5eV$I8_+12@W97(r9?C<;bH0)i88W$) zUqFyjhO~uym5@7ljyD|Wdb6o}z%?8Xra2YP!`2*;r1wo-eK}^Pku5%Dt>lq&95+gN zgo3sDlfgTbY2PP!#nBBg`5jk+G!;8(bN*eGC#rO1W|b^FOUtN#_-@x*^a81((8JlT zZE67cDlfXkFOkMQ8{!)SW14c=Rh-~@RGK2Eg=*w1s`?p7vo1qtOcm*LhUaz>I6q59=wzcs9ON>G~P`kTG(0GN^F$#N=cer&^swRNv8+YG*tbe9?QPazf?u2eDp z$E(thWAuq<7@M_4@5M`1^J6`F0IVAzmo#^#6N`rr)h%K}d=Xsv6q_Hi7^-}e5EK(6;Zu;{e)JRf#ZDf|(T}=6xU8Z{xcM2oDR$MAg8u*#CH1j`n>$;r-{<&0> WSQI+~US5-x6fy|BV?6d8HUI!?O?JZo diff --git a/src/freedombone b/src/freedombone index f1de93c8..ef5dc86a 100755 --- a/src/freedombone +++ b/src/freedombone @@ -4080,7 +4080,6 @@ function configure_firewall_for_irc { fi iptables -A INPUT -p tcp --dport $IRC_PORT -j ACCEPT iptables -I INPUT -p tcp --dport 1024:65535 --sport $IRC_PORT -j ACCEPT - iptables -A INPUT -p tcp --dport 9999 -j ACCEPT save_firewall_settings echo 'configure_firewall_for_irc' >> $COMPLETION_FILE } @@ -7148,7 +7147,7 @@ function install_irc_server { sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf - sed -i "s/;Ports =.*/Ports = $IRC_PORT, 9999, $IRC_ONION_PORT/g" /etc/ngircd/ngircd.conf + sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/g" /etc/ngircd/ngircd.conf sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf @@ -7181,7 +7180,7 @@ function install_irc_server { IRC_ONION_HOSTNAME= if [[ $ONION_ONLY != "no" ]]; then - sed -i "s/;Ports =.*/Ports = $IRC_PORT, 9999/g" /etc/ngircd/ngircd.conf + sed -i "s/;Ports =.*/Ports = $IRC_PORT/g" /etc/ngircd/ngircd.conf IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT}) else IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_ONION_PORT}) @@ -9667,7 +9666,6 @@ function install_final { XMPP 5269 XMPP 5280-5281 IRC 6697 - IRC 9999 Git 9418 Email 25 Email 587 diff --git a/website/EN/installation.html b/website/EN/installation.html index f4a5d5d4..039a330b 100644 --- a/website/EN/installation.html +++ b/website/EN/installation.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -541,11 +541,6 @@ On your internet router, typically under firewall settings, open the following p 6697 - -IRC -9999 - - Git 9418