Browse Source

Comment out the second ports entry for onion only installs

Bob Mottram 8 years ago
parent
commit
1a3b57b0f0
1 changed files with 7 additions and 1 deletions
  1. 7
    1
      src/freedombone-app-irc

+ 7
- 1
src/freedombone-app-irc View File

@@ -528,7 +528,7 @@ function install_irc_server {
528 528
     sed -i "s/irc.example.net/$DEFAULTDOMAIN/g" /etc/ngircd/ngircd.conf
529 529
     sed -i "s|Yet another IRC Server running on Debian GNU/Linux|IRC Server of $DEFAULTDOMAIN|g" /etc/ngircd/ngircd.conf
530 530
     sed -i 's/;Password = wealllikedebian/Password =/g' /etc/ngircd/ngircd.conf
531
-    sed -i "s/;Ports =.*/Ports = ${IRC_PORT}/1" /etc/ngircd/ngircd.conf
531
+    sed -i "s/;Ports =.*/Ports = ${IRC_PORT}/g" /etc/ngircd/ngircd.conf
532 532
     if [[ $ONION_ONLY == 'no' ]]; then
533 533
         if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
534 534
             sed -i "s|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/ngircd/ngircd.conf
@@ -538,6 +538,12 @@ function install_irc_server {
538 538
         sed -i "s|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam|g" /etc/ngircd/ngircd.conf
539 539
         sed -i "s|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/ngircd/ngircd.conf
540 540
         sed -i "s/;Ports =.*/Ports = ${IRC_PORT}/2" /etc/ngircd/ngircd.conf
541
+    else
542
+        sed -i 's|;SSLConnect.*|SSLConnect = no|g'
543
+        # comment out the second Ports entry
544
+        if ! grep ";Ports =" /etc/ngircd/ngircd.conf; then
545
+            sed -i '0,/Ports =/! s/Ports =/;Ports =/' /etc/ngircd/ngircd.conf
546
+        fi
541 547
     fi
542 548
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
543 549
     sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf