updated: Web / email address

changed: Some housekeeping/tweaks
arno-iptables-firewall · Jun 7, 2023 · d471f9d · d471f9d
1 parent b1b0de5
commit d471f9d
Show file tree

Hide file tree

Showing 31 changed files with 78 additions and 78 deletions.
diff --git a/README b/README
@@ -1,11 +1,11 @@
                     -= Arno's Iptables Firewall(AIF) =-
          Single- & multi-homed firewall script with DSL/ADSL support
 
-                      ~ In memory of my dear father ~
+                      ~ In memory of my dear parents ~
 
 (C) Copyright 2001-2019 by Arno van Amersfoort & Lonnie Abelbeck
-Homepage   : https://rocky.eld.leidenuniv.nl/
-Email      : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+Web        : https://github.com/arno-iptables-firewall/aif
+Email      : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
              (note: you must remove all spaces and substitute the @ and the .
              at the proper locations!)
 -------------------------------------------------------------------------------

diff --git a/bin/arno-fwfilter b/bin/arno-fwfilter
@@ -17,8 +17,8 @@
 #                  Firewall-log filter script (arno-fwfilter)
 #
 # (C) Copyright 2001-2015 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                          at the proper locations!)
 # ------------------------------------------------------------------------------------------
@@ -436,7 +436,7 @@ else
               if (RESOLVE_NAMES==1 || SHOW_LOCATION==1)
                 if (USE_1ROW==0)
                 {
-                  if (USE_HTML==1) printf("<br>\n                         "); else printf("\n               ")
+                  if (USE_HTML==1) printf("<br>\n                         "); else printf("\n               ")
                 }
 
               if (USE_ANSI_COLORS==1) printf("\033[0m\033[1;36m")
@@ -461,7 +461,7 @@ else
               if (RESOLVE_NAMES==1 || SHOW_LOCATION==1)
                 if (USE_1ROW==0)
                 {
-                  if (USE_HTML==1) printf("<br>\n                         "); else printf("\n               ")
+                  if (USE_HTML==1) printf("<br>\n                         "); else printf("\n               ")
                 }
 
               if (USE_ANSI_COLORS==1) printf("\033[0m\033[1;35m")
@@ -498,7 +498,7 @@ else
           offset=i+1
           if (USE_1ROW==0)
           {
-            if (USE_HTML==1) printf("<br>\n                         "); else printf("\n               ")
+            if (USE_HTML==1) printf("<br>\n                         "); else printf("\n               ")
           }
           else printf(" ")
         }

diff --git a/bin/arno-iptables-firewall b/bin/arno-iptables-firewall
@@ -10,11 +10,11 @@ CONFIG_FILE=/etc/arno-iptables-firewall/firewall.conf
 #                         -= Arno's Iptables Firewall(AIF) =-
 #               Single- & multi-homed firewall script with DSL/ADSL support
 #
-#                           ~ In memory of my dear father ~
+#                           ~ In memory of my dear parents ~
 #
 # (C) Copyright 2001-2023 by Arno van Amersfoort & Lonnie Abelbeck
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------
@@ -32,7 +32,7 @@ CONFIG_FILE=/etc/arno-iptables-firewall/firewall.conf
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # ------------------------------------------------------------------------------
 
-printf "\033[40m\033[1;32mArno's Iptables Firewall(AIF) v$MY_VERSION\033[0m\n"
+echo "Arno's Iptables Firewall(AIF) v$MY_VERSION"
 echo "-------------------------------------------------------------------------------"
 
 # Check if the main config file exists and if so load it
@@ -4696,7 +4696,7 @@ if ipset_check; then
         rm -f "$IP6TABLES_BATCH_FILE"
       fi
     else
-      printf "\033[40m\033[1;31mNOTE: Cannot read the blocked hosts file \"$BLOCK_HOSTS_FILE\".\033[0m\n"
+      printf "\033[40m\033[1;31mWARNING: Cannot read the blocked hosts file \"$BLOCK_HOSTS_FILE\".\033[0m\n"
     fi
   fi
 
@@ -4716,7 +4716,7 @@ if ipset_check; then
   fi
 else
   if [ -n "$BLOCK_NETSET_DIR" ]; then
-    printf "\033[40m\033[1;31mNOTE: Blocking using .netset files in BLOCK_NETSET_DIR requires IPTABLES_IPSET to be enabled.\033[0m\n"
+    printf "\033[40m\033[1;31mWARNING: Blocking using .netset files in BLOCK_NETSET_DIR requires IPTABLES_IPSET to be enabled.\033[0m\n"
   fi
 
   if [ -z "$BLOCK_HOSTS" -a -z "$BLOCK_HOSTS_FILE" ]; then
@@ -4807,7 +4807,7 @@ else
 
       echo "$total_cnt host line(s) read"
     else
-      printf "\033[40m\033[1;31mNOTE: Cannot read the blocked hosts file \"$BLOCK_HOSTS_FILE\".\033[0m\n"
+      printf "\033[40m\033[1;31mWARNING: Cannot read the blocked hosts file \"$BLOCK_HOSTS_FILE\".\033[0m\n"
     fi
   fi
 
@@ -4846,7 +4846,7 @@ setup_mangle_tables()
         ip4tables -t mangle -A OUTPUT -o $interface -j TTL --ttl-set $PACKET_TTL
       done
     else
-      printf "\033[40m\033[1;31m WARNING: Ingoring invalid value for PACKET_TTL ($PACKET_TTL), it should be between 10 and 255!\033[0m\n" >&2
+      printf "\033[40m\033[1;31m WARNING: Ignoring invalid value for PACKET_TTL ($PACKET_TTL), it should be between 10 and 255!\033[0m\n" >&2
     fi
   fi
 
@@ -6207,15 +6207,15 @@ show_failed()
 show_stop()
 {
   DATE=`LC_ALL=C date +'%b %d %H:%M:%S'`
-  printf "$DATE \033[40m\033[1;32mStopping Arno's Iptables Firewall(AIF) v$MY_VERSION\033[0m\n"
+  echo "$DATE Stopping Arno's Iptables Firewall(AIF) v$MY_VERSION"
   echo "** Stopping Arno's Iptables Firewall(AIF) v$MY_VERSION **" |log_msg
 }
 
 
 show_stop_blocked()
 {
   DATE=`LC_ALL=C date +'%b %d %H:%M:%S'`
-  printf "$DATE \033[40m\033[1;31mFIREWALL DISABLED & BLOCKING ALL INTERNET TRAFFIC!\033[0m\n"
+  echo "$DATE FIREWALL DISABLED & BLOCKING ALL INTERNET TRAFFIC!"
   echo "** FIREWALL DISABLED & BLOCKING ALL INTERNET TRAFFIC! **" |log_msg
 }
 
@@ -6230,7 +6230,7 @@ show_applied()
     printf "$DATE \033[40m\033[1;31mWARNING: $RULE_WARNING firewall rules failed to apply!\n\033[0m" >&2
     echo "** WARNING: $RULE_WARNING firewall rules failed to apply! **" |log_msg
   else
-    printf "$DATE \033[40m\033[1;32mAll firewall rules applied.\033[0m\n"
+    echo "$DATE All firewall rules applied"
     echo "** All firewall rules applied **" |log_msg
   fi
 }
@@ -6239,7 +6239,7 @@ show_applied()
 show_disabled()
 {
   DATE=`LC_ALL=C date +'%b %d %H:%M:%S'`
-  printf "$DATE \033[40m\033[1;31mFIREWALL DISABLED!\033[0m\n"
+  echo "$DATE FIREWALL DISABLED!"
 }
 
 

diff --git a/configure.sh b/configure.sh
@@ -6,11 +6,11 @@ MY_VERSION="1.06"
 #                         -= Arno's Iptables Firewall(AIF) =-
 #              Single- & multi-homed firewall script with DSL/ADSL support
 #
-#                           ~ In memory of my dear father ~
+#                           ~ In memory of my dear parents ~
 #
 # (C) Copyright 2001-2022 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------------------

diff --git a/etc/arno-iptables-firewall/firewall.conf b/etc/arno-iptables-firewall/firewall.conf
@@ -7,8 +7,8 @@
 #         Single- & multi-homed firewall script with DSL/ADSL support
 #
 # (C) Copyright 2001-2023 by Arno van Amersfoort & Lonnie Abelbeck
-# Homepage   : https://rocky.eld.leidenuniv.nl/
-# Email      : arnova AT rocky DOT eld DOT leidenuniv DOT nl
+# Web        : https://github.com/arno-iptables-firewall/aif
+# Email      : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #              (note: you must remove all spaces and substitute the @ and the .
 #              at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/install.sh b/install.sh
@@ -6,11 +6,11 @@ MY_VERSION="1.14c"
 #                         -= Arno's Iptables Firewall(AIF) =-
 #              Single- & multi-homed firewall script with DSL/ADSL support
 #
-#                           ~ In memory of my dear father ~
+#                           ~ In memory of my dear parents ~
 #
 # (C) Copyright 2001-2021 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------------------

diff --git a/lib/systemd/system/arno-iptables-firewall.service b/lib/systemd/system/arno-iptables-firewall.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Arno's Iptables Firewall(AIF)
 Documentation=man:arno-iptables-firewall(8)
-Documentation=https://rocky.eld.leidenuniv.nl/
+Documentation=https://github.com/arno-iptables-firewall/aif
 DefaultDependencies=no
 After=local-fs.target network-online.target
 Requires=local-fs.target network-online.target

diff --git a/share/arno-iptables-firewall/aif-job-execute b/share/arno-iptables-firewall/aif-job-execute
@@ -4,11 +4,11 @@
 #                         -= Arno's Iptables Firewall(AIF) =-
 #              Single- & multi-homed firewall script with DSL/ADSL support
 #
-#                           ~ In memory of my dear father ~
+#                           ~ In memory of my dear parents ~
 #
 # (C) Copyright 2001-2021 by Arno van Amersfoort & Lonnie Abelbeck
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/aif-job-processor b/share/arno-iptables-firewall/aif-job-processor
@@ -4,11 +4,11 @@
 #                         -= Arno's Iptables Firewall(AIF) =-
 #              Single- & multi-homed firewall script with DSL/ADSL support
 #
-#                           ~ In memory of my dear father ~
+#                           ~ In memory of my dear parents ~
 #
 # (C) Copyright 2001-2021 by Arno van Amersfoort & Lonnie Abelbeck
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/environment b/share/arno-iptables-firewall/environment
@@ -2,11 +2,11 @@
 #                         -= Arno's Iptables Firewall(AIF) =-
 #              Single- & multi-homed firewall script with DSL/ADSL support
 #
-#                           ~ In memory of my dear father ~
+#                           ~ In memory of my dear parents ~
 #
 # (C) Copyright 2001-2020 by Arno van Amersfoort & Lonnie Abelbeck
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/10mac-address-filter.plugin b/share/arno-iptables-firewall/plugins/10mac-address-filter.plugin
@@ -12,8 +12,8 @@ PLUGIN_CONF_FILE="mac-address-filter.conf"
 #                         (eg. INT_IF)
 #
 # Author                : (C) Copyright 2010-2015 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/20nat-loopback.plugin b/share/arno-iptables-firewall/plugins/20nat-loopback.plugin
@@ -13,8 +13,8 @@ PLUGIN_CONF_FILE="nat-loopback.conf"
 #                         port to access NAT forwarded internal servers.
 #
 # Author                : (C) Copyright 2012-2019 by Lonnie Abelbeck & Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/20parasitic-net.plugin b/share/arno-iptables-firewall/plugins/20parasitic-net.plugin
@@ -18,8 +18,8 @@ PLUGIN_CONF_FILE="parasitic-net.conf"
 #                         only works for IPv4, NOT IPv6
 #
 # Author                : (C) Copyright 2017-2020 by Arno van Amersfoort & Lonnie Abelbeck
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/50dsl-ppp-modem.plugin b/share/arno-iptables-firewall/plugins/50dsl-ppp-modem.plugin
@@ -10,8 +10,8 @@ PLUGIN_CONF_FILE="dsl-ppp-modem.conf"
 # Comments              : This implements support for (A)DSL PPP modems
 #
 # Author                : (C) Copyright 2008-2011 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/50dyndns-host-open.plugin b/share/arno-iptables-firewall/plugins/50dyndns-host-open.plugin
@@ -10,8 +10,8 @@ PLUGIN_CONF_FILE="dyndns-host-open.conf"
 # Comments              : This implements dynamic DNS (DynDNS) support for eg. opening ports
 #
 # Author                : (C) Copyright 2008-2019 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/50ipsec-vpn.plugin b/share/arno-iptables-firewall/plugins/50ipsec-vpn.plugin
@@ -10,7 +10,7 @@ PLUGIN_CONF_FILE="ipsec-vpn.conf"
 # Comments              : This plugin adds all required rules for using Racoon IPSEC.
 #
 # Author                : (C) Copyright 2006-2016 by Philip Prindeville & Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
+# Web                   : https://github.com/arno-iptables-firewall/aif
 # Email                 : philipp AT redfish-solutions DOT com
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)

diff --git a/share/arno-iptables-firewall/plugins/50ipv6-over-ipv4.plugin b/share/arno-iptables-firewall/plugins/50ipv6-over-ipv4.plugin
@@ -11,8 +11,8 @@ PLUGIN_CONF_FILE="ipv6-over-ipv4.conf"
 #                         IPv6 tunneling. Only works with AIF 1.9+ !
 #
 # Author                : (C) Copyright 2010 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/50multiroute.plugin b/share/arno-iptables-firewall/plugins/50multiroute.plugin
@@ -20,8 +20,8 @@ PLUGIN_CONF_FILE="multiroute.conf"
 #                         use the 'ifconfig' and 'route' commands.
 #
 # Author                : (C) Copyright 2005-2020 by Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/50pptp-vpn-passthrough.plugin b/share/arno-iptables-firewall/plugins/50pptp-vpn-passthrough.plugin
@@ -11,8 +11,8 @@ PLUGIN_CONF_FILE="pptp-vpn-passthrough.conf"
 #                         to access remote PPTP VPN Server(s) when NAT is enabled.
 #
 # Author                : (C) Copyright 2016-2017 by Lonnie Abelbeck & Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------

diff --git a/share/arno-iptables-firewall/plugins/50pptp-vpn.plugin b/share/arno-iptables-firewall/plugins/50pptp-vpn.plugin
@@ -10,8 +10,8 @@ PLUGIN_CONF_FILE="pptp-vpn.conf"
 # Comments              : This plugin adds all required rules for using a PPTP Server.
 #
 # Author                : (C) Copyright 2011 by Lonnie Abelbeck & Arno van Amersfoort
-# Homepage              : https://rocky.eld.leidenuniv.nl/
-# Email                 : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# Web                   : https://github.com/arno-iptables-firewall/aif
+# Email                 : a r n o DOT v a n DOT a m e r s f o o r t AT g m a i l DOT c o m
 #                         (note: you must remove all spaces and substitute the @ and the .
 #                         at the proper locations!)
 # ------------------------------------------------------------------------------