浏览代码

port changing

Bob Mottram 9 年前
父节点
当前提交
5638af5cdc
共有 2 个文件被更改,包括 7 次插入10 次删除
  1. 1
    1
      src/freedombone
  2. 6
    9
      src/freedombone-controlpanel

+ 1
- 1
src/freedombone 查看文件

7451
     sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
7451
     sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
7452
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
7452
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
7453
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
7453
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
7454
+    sed -i "s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
7454
     if [[ $ONION_ONLY != 'yes' ]]; then
7455
     if [[ $ONION_ONLY != 'yes' ]]; then
7455
         sed -i "s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7456
         sed -i "s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7456
     else
7457
     else
7457
         sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7458
         sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7458
     fi
7459
     fi
7459
-    sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
7460
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
7460
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
7461
     sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf
7461
     sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf
7462
     sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
7462
     sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf

+ 6
- 9
src/freedombone-controlpanel 查看文件

591
     if [[ $irc_onion == 'no' ]]; then
591
     if [[ $irc_onion == 'no' ]]; then
592
         if grep -q ";Ports = 6667" /etc/ngircd/ngircd.conf; then
592
         if grep -q ";Ports = 6667" /etc/ngircd/ngircd.conf; then
593
             sed -i "s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
593
             sed -i "s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
594
-            sed -i "s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
595
         else
594
         else
596
-            sed -i "s/Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
597
-            sed -i "s/Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
595
+            if ! grep -q ";Ports = $IRC_PORT, $IRC_ONION_PORT" /etc/ngircd/ngircd.conf; then
596
+                sed -i "s/Ports = $IRC_PORT, $IRC_ONION_PORT/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
597
+            fi
598
         fi
598
         fi
599
         systemctl restart ngircd
599
         systemctl restart ngircd
600
         dialog --title $"IRC Server" \
600
         dialog --title $"IRC Server" \
601
                --msgbox $"The IRC server can now be accessed via SSL at your main domain name" 8 50
601
                --msgbox $"The IRC server can now be accessed via SSL at your main domain name" 8 50
602
     else
602
     else
603
-        sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
604
-        if grep -q ";Ports = 6667" /etc/ngircd/ngircd.conf; then
605
-            sed -i "s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
606
-        else
607
-            sed -i "s/Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
603
+        if grep -q ";Ports = $IRC_PORT, $IRC_ONION_PORT" /etc/ngircd/ngircd.conf; then
604
+            sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
605
+            systemctl restart ngircd
608
         fi
606
         fi
609
-        systemctl restart ngircd
610
         dialog --title $"IRC Server" \
607
         dialog --title $"IRC Server" \
611
                --msgbox $"The IRC server can now be accessed via its onion address without SSL" 8 50
608
                --msgbox $"The IRC server can now be accessed via its onion address without SSL" 8 50
612
     fi
609
     fi