free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

We probably don't need port 9999 for irc

Bob Mottram 9 years ago
parent
ed095283f4
commit
34a576923b
4 changed files with 3 additions and 11 deletions
Unified View Show Diff Stats
  1. 0
    1
      doc/EN/installation.org
  2. BIN
      man/freedombone.1.gz
  3. 2
    4
      src/freedombone
  4. 1
    6
      website/EN/installation.html

+ 0
- 1
doc/EN/installation.org View File

181 
 | XMPP    |       5269 |
 181 
 | XMPP    |       5269 |
182 
 | XMPP    | 5280..5281 |
 182 
 | XMPP    | 5280..5281 |
183 
 | IRC     |       6697 |
 183 
 | IRC     |       6697 |
184 
-| IRC     |       9999 |
185 
 | Git     |       9418 |
 184 
 | Git     |       9418 |
186 
 | Email   |         25 |
 185 
 | Email   |         25 |
187 
 | Email   |        587 |
 186 
 | Email   |        587 |

BIN
man/freedombone.1.gz View File


+ 2
- 4
src/freedombone View File

4080 
     fi
 4080 
     fi
4081 
     iptables -A INPUT -p tcp --dport $IRC_PORT  -j ACCEPT
 4081 
     iptables -A INPUT -p tcp --dport $IRC_PORT  -j ACCEPT
4082 
     iptables -I INPUT -p tcp --dport 1024:65535 --sport $IRC_PORT -j ACCEPT
 4082 
     iptables -I INPUT -p tcp --dport 1024:65535 --sport $IRC_PORT -j ACCEPT
4083 
-    iptables -A INPUT -p tcp --dport 9999 -j ACCEPT
4084 
     save_firewall_settings
 4083 
     save_firewall_settings
4085 
     echo 'configure_firewall_for_irc' >> $COMPLETION_FILE
 4084 
     echo 'configure_firewall_for_irc' >> $COMPLETION_FILE
4086 
 }
 4085 
 }
7148 
     sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
 7147 
     sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
7149 
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
 7148 
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
7150 
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
 7149 
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
7151 
-    sed -i "s/;Ports =.*/Ports = $IRC_PORT, 9999, $IRC_ONION_PORT/g" /etc/ngircd/ngircd.conf
7150 
+    sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/g" /etc/ngircd/ngircd.conf
7152 
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
 7151 
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
7153 
     sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf
 7152 
     sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf
7154 
     sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
 7153 
     sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
7181
7180
7182 
     IRC_ONION_HOSTNAME=
 7181 
     IRC_ONION_HOSTNAME=
7183 
     if [[ $ONION_ONLY != "no" ]]; then
 7182 
     if [[ $ONION_ONLY != "no" ]]; then
7184 
-        sed -i "s/;Ports =.*/Ports = $IRC_PORT, 9999/g" /etc/ngircd/ngircd.conf
7183 
+        sed -i "s/;Ports =.*/Ports = $IRC_PORT/g" /etc/ngircd/ngircd.conf
7185 
         IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT})
 7184 
         IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT})
7186 
     else
 7185 
     else
7187 
         IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_ONION_PORT})
 7186 
         IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_ONION_PORT})
9667 
                      XMPP     5269
 9666 
                      XMPP     5269
9668 
                      XMPP     5280-5281
 9667 
                      XMPP     5280-5281
9669 
                      IRC      6697
 9668 
                      IRC      6697
9670 
-                     IRC      9999
9671 
                      Git      9418
 9669 
                      Git      9418
9672 
                      Email    25
 9670 
                      Email    25
9673 
                      Email    587
 9671 
                      Email    587

+ 1
- 6
website/EN/installation.html View File

3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 3 
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
-<!-- 2016-01-05 Tue 15:59 -->
6 
+<!-- 2016-01-06 Wed 14:52 -->
7 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 7 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
 8 
 <meta  name="viewport" content="width=device-width, initial-scale=1" />
9 
 <title></title>
 9 
 <title></title>
542 
 </tr>
 542 
 </tr>
543
543
544 
 <tr>
 544 
 <tr>
545 
-<td class="org-left">IRC</td>
546 
-<td class="org-right">9999</td>
547 
-</tr>
548 
-
549 
-<tr>
550 
 <td class="org-left">Git</td>
 545 
 <td class="org-left">Git</td>
551 
 <td class="org-right">9418</td>
 546 
 <td class="org-right">9418</td>
552 
 </tr>
 547 
 </tr>