bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Make less noisy

Browse Source
This commit is contained in:
Bryan Roessler
2023-03-22 12:34:38 -04:00
parent 82113fb470
commit f8678629dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installJRMC
View File

@@ -1094,7 +1094,7 @@ openFirewall() {
declare u_ports="${u_ports// /|}" # concatenate declare u_ports="${u_ports// /|}" # concatenate
u_ports="${u_ports//-/\:}" # for ufw u_ports="${u_ports//-/\:}" # for ufw
if hash firewall-cmd 2>/dev/null; then if hash firewall-cmd &>/dev/null; then
if ! sudo firewall-cmd --get-services | grep -q "$service"; then if ! sudo firewall-cmd --get-services | grep -q "$service"; then
execute sudo firewall-cmd --permanent "--new-service=$service" execute sudo firewall-cmd --permanent "--new-service=$service"
execute sudo firewall-cmd --permanent "--service=$service" "--set-description=$service" installed by installJRMC execute sudo firewall-cmd --permanent "--service=$service" "--set-description=$service" installed by installJRMC
@@ -1105,7 +1105,7 @@ openFirewall() {
execute sudo firewall-cmd --add-service "$service" --permanent execute sudo firewall-cmd --add-service "$service" --permanent
execute sudo firewall-cmd --reload execute sudo firewall-cmd --reload
fi fi
elif hash ufw 2>/dev/null; then elif hash ufw &>/dev/null; then
sudo bash -c "cat <<-EOF > /etc/ufw/applications.d/$service sudo bash -c "cat <<-EOF > /etc/ufw/applications.d/$service
[$service] [$service]
title=$service title=$service
@@ -1632,11 +1632,11 @@ uninstall() {
fi fi
echo "Removing firewall rules" echo "Removing firewall rules"
if hash firewall-cmd 2>/dev/null; then if hash firewall-cmd &>/dev/null; then
execute sudo firewall-cmd --permanent --remove-service=jriver execute sudo firewall-cmd --permanent --remove-service=jriver
execute sudo firewall-cmd --permanent --delete-service=jriver execute sudo firewall-cmd --permanent --delete-service=jriver
execute sudo firewall-cmd --reload execute sudo firewall-cmd --reload
elif hash ufw 2>/dev/null; then elif hash ufw &>/dev/null; then
execute sudo ufw delete allow jriver execute sudo ufw delete allow jriver
[[ -f "/etc/ufw/applications.d/jriver" ]] && [[ -f "/etc/ufw/applications.d/jriver" ]] &&
execute sudo rm -f /etc/ufw/applications.d/jriver execute sudo rm -f /etc/ufw/applications.d/jriver