From cc7f45e70c2c0f985da573d8c1ed9164c8a4fdda Mon Sep 17 00:00:00 2001
From: Kaj Forney <kajforney@my.cwi.edu>
Date: Wed, 25 Sep 2019 14:13:36 -0600
Subject: [PATCH] Update firewalld script.

Former-commit-id: ec1c5210d0e8a718e5123171b902f41544f12945
Former-commit-id: c0c73f48091837dc704a3d7c56028264738a09b5
---
 filesystem/etc/skel/bin/fw | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/filesystem/etc/skel/bin/fw b/filesystem/etc/skel/bin/fw
index cd2a47fa..32c31c47 100755
--- a/filesystem/etc/skel/bin/fw
+++ b/filesystem/etc/skel/bin/fw
@@ -1,5 +1,8 @@
 #!/bin/bash
 # init
+function pause(){
+echo 'Press any key to continue...';   read -p "$*"
+}
 clear
     OPTION=$(whiptail --backtitle "Option Menu" \
      --title "FirewallD Menu" \
@@ -10,9 +13,9 @@ clear
     "4."  "Firewall Reload........... Reload firewall" \
     "5."  "Firewall Status........... Show open services and ports" \
     "6."  "Firewall State............ Run status" \
-    "7."  "Firewall Services......... Show services" \
-    "8."  "Firewall Open RDP........ Open 3389" \
-    "9."  "Firewall Open Web Server.. Open http/https" \
+    "7."  "Firewall Open RDP......... Open 3389" \
+    "8."  "Firewall Open Web Server.. Open http/https" \
+    "9."  "Firewall Reset to Default. Close http/https/3389" \
     "10." "Firewall Panic On......... ENABLE PANIC MODE" \
     "11." "Firewall Panic Off........ DISABLE PANIC MODE" \
     "12." "Firewall Panic Status..... Check panic mode status" \
@@ -30,15 +33,18 @@ case "$OPTION" in
       pause;;
    6.)  firewall-cmd --state
       pause;;
-   7.)  firewall-cmd --get-services
-      pause;;
-   8.)  firewall-cmd --add-port=3389/tcp --permanent
+   7.)  firewall-cmd --add-port=3389/tcp --permanent
         firewall-cmd --reload
       pause;;
-   9.)  firewall-cmd --add-service=http --permanent
+   8.)  firewall-cmd --add-service=http --permanent
         firewall-cmd --add-service=https --permanent
         firewall-cmd --reload
       pause;;
+   9.)  firewall-cmd --remove-service=http --permanent
+        firewall-cmd --remove-service=https --permanent
+        firewall-cmd --remove-port=3389/tcp --permanent
+        firewall-cmd --reload
+      pause;;
    10.) firewall-cmd --panic-on
         firewall-cmd --reload
       pause;;