Kaynağa Gözat

Fix sed for irc port changes

Bob Mottram 9 yıl önce
ebeveyn
işleme
b25f9b1de8
2 değiştirilmiş dosya ile 6 ekleme ve 6 silme
  1. 2
    2
      src/freedombone
  2. 4
    4
      src/freedombone-controlpanel

+ 2
- 2
src/freedombone Dosyayı Görüntüle

@@ -7452,9 +7452,9 @@ function install_irc_server {
7452 7452
     sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
7453 7453
     sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
7454 7454
     if [[ $ONION_ONLY != 'yes' ]]; then
7455
-        sed -i ":a;N;\$!ba;s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7455
+        sed -i "s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7456 7456
     else
7457
-        sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7457
+        sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
7458 7458
     fi
7459 7459
     sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
7460 7460
     sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf

+ 4
- 4
src/freedombone-controlpanel Dosyayı Görüntüle

@@ -589,14 +589,14 @@ function irc_via_onion {
589 589
         255) return;;
590 590
     esac
591 591
     if [[ $irc_onion == 'no' ]]; then
592
-        sed -i ":a;N;\$!ba;s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
593
-        sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
592
+        sed -i "s/;Ports =.*/;Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
593
+        sed -i "s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
594 594
         systemctl restart ngircd
595 595
         dialog --title $"IRC Server" \
596 596
                --msgbox $"The IRC server can now be accessed via SSL at your main domain name" 8 50
597 597
     else
598
-        sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
599
-        sed -i ":a;N;\$!ba;s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
598
+        sed -i "s/;Ports =.*/Ports = $IRC_PORT, $IRC_ONION_PORT/1" /etc/ngircd/ngircd.conf
599
+        sed -i "s/;Ports =.*/Ports = $IRC_PORT/2" /etc/ngircd/ngircd.conf
600 600
         systemctl restart ngircd
601 601
         dialog --title $"IRC Server" \
602 602
                --msgbox $"The IRC server can now be accessed via its onion address without SSL" 8 50