소스 검색

Run pleroma blocking script after firewall entry

Bob Mottram 7 년 전
부모
커밋
1702ba5a4a
2개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 2
    2
      src/freedombone-controlpanel
  2. 3
    0
      src/freedombone-utils-firewall

+ 2
- 2
src/freedombone-controlpanel 파일 보기

1926
     trap "rm -f $data" 0 1 2 5 15
1926
     trap "rm -f $data" 0 1 2 5 15
1927
     dialog --title $"Block a domain or user" \
1927
     dialog --title $"Block a domain or user" \
1928
            --backtitle $"Freedombone Control Panel" \
1928
            --backtitle $"Freedombone Control Panel" \
1929
-           --inputbox $"Enter the domain name or GNU Social/postActiv nick@domain that you wish to block" 8 60 "" 2>$data
1929
+           --inputbox $"Enter the domain name or GNU Social/postActiv/Pleroma nick@domain that you wish to block" 8 60 "" 2>$data
1930
     sel=$?
1930
     sel=$?
1931
     case $sel in
1931
     case $sel in
1932
         0)
1932
         0)
1938
                         dialog --title $"Block a domain" \
1938
                         dialog --title $"Block a domain" \
1939
                                --msgbox $"The domain $blocked_domain has been blocked" 6 40
1939
                                --msgbox $"The domain $blocked_domain has been blocked" 6 40
1940
                     else
1940
                     else
1941
-                        dialog --title $"Block a GNU Social/postActiv nickname" \
1941
+                        dialog --title $"Block a GNU Social/postActiv/Pleroma nickname" \
1942
                                --msgbox $"$blocked_domain has been blocked" 6 40
1942
                                --msgbox $"$blocked_domain has been blocked" 6 40
1943
                     fi
1943
                     fi
1944
                 fi
1944
                 fi

+ 3
- 0
src/freedombone-utils-firewall 파일 보기

547
         if [ -f /usr/bin/postactiv-firewall ]; then
547
         if [ -f /usr/bin/postactiv-firewall ]; then
548
             /usr/bin/postactiv-firewall
548
             /usr/bin/postactiv-firewall
549
         fi
549
         fi
550
+        if [ -f /usr/bin/pleroma-blocking ]; then
551
+            /usr/bin/pleroma-blocking
552
+        fi
550
     fi
553
     fi
551
 }
554
 }
552
 
555