Merge branch 'torbox_v054' into torbox_mini

radio24 · Mar 26, 2024 · f35f2ae · f35f2ae
2 parents 81a3d21 + aad4329
commit f35f2ae
Show file tree

Hide file tree

Showing 57 changed files with 72 additions and 82 deletions.
diff --git a/bin/automat b/bin/automat
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/backup b/bin/backup
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/bridges_activate_obfs4 b/bin/bridges_activate_obfs4
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2016,SC2154
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_activate_snowflake b/bin/bridges_activate_snowflake
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2016,SC2154
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_add_obfs4 b/bin/bridges_add_obfs4
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2004,SC2010,SC2012,SC2016,SC2062,SC2064,SC2128,SC2178
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_add_snowflake b/bin/bridges_add_snowflake
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2004,SC2010,SC2012,SC2016,SC2062,SC2064,SC2128,SC2178
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_check.py b/bin/bridges_check.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_deactivate_obfs4 b/bin/bridges_deactivate_obfs4
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2016,SC2154
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_get.py b/bin/bridges_get.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_remove_obfs4 b/bin/bridges_remove_obfs4
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2016,SC2154
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/bridges_remove_snowflake b/bin/bridges_remove_snowflake
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2016,SC2154
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/catchbuiltinbridges.py b/bin/catchbuiltinbridges.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 #
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/change_MAC b/bin/change_MAC
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2120,SC2128,SC2178
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/clock.py b/bin/clock.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/dynamic_ip_check.py b/bin/dynamic_ip_check.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github: https://github.com/radio24/TorBox

diff --git a/bin/exclude-slow-tor-relays-ng b/bin/exclude-slow-tor-relays-ng
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github: https://github.com/radio24/TorBox

diff --git a/bin/find_domains b/bin/find_domains
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2076,SC2190
 
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/first_use b/bin/first_use
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2064
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/hostapd_fallback b/bin/hostapd_fallback
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/hostapd_fallback_komplex_part_1 b/bin/hostapd_fallback_komplex_part_1
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/hostapd_fallback_komplex_part_2 b/bin/hostapd_fallback_komplex_part_2
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/meek-azure b/bin/meek-azure
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/regset b/bin/regset
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/bin/restore b/bin/restore
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001,SC2016
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/set_captive_2 b/bin/set_captive_2
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/set_interfaces_2 b/bin/set_interfaces_2
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/set_interfaces_3 b/bin/set_interfaces_3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/start_tcs b/bin/start_tcs
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/bin/start_tfs b/bin/start_tfs
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/etc/onionservices/apache2/sites-available/sample-onion.conf b/etc/onionservices/apache2/sites-available/sample-onion.conf
diff --git a/etc/onionservices/nginx/sites-available/sample-onion.conf b/etc/onionservices/nginx/sites-available/sample-onion.conf
diff --git a/etc/rc.local b/etc/rc.local
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 #
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/etc/rc.local.disable_wlan b/etc/rc.local.disable_wlan
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 #
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/install/Sixfab_PPP_Installer-master/ppp_installer/install.sh b/install/Sixfab_PPP_Installer-master/ppp_installer/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox

diff --git a/install/install_network_drivers b/install/install_network_drivers
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2046
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/install/log_check_config/header b/install/log_check_config/header
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/install/log_check_config/log_check_config.py b/install/log_check_config/log_check_config.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # This file is part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 #
 # This program is free software: you can redistribute it and/or modify

diff --git a/install/openvpn-install.sh b/install/openvpn-install.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC1091,SC2129,SC2164,SC2034,SC1072,SC1073,SC1009
 
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox
@@ -32,6 +32,7 @@ NO_SPACER=2
 #
 #Set the the variables for the menu
 MENU_WIDTH=80
+MENU_HEIGHT_20=20
 MENU_HEIGHT_25=25
 # MENU_HEIGHT should not exceed 26
 MENU_HEIGHT=$((8+NO_ITEMS+NO_SPACER))
@@ -730,6 +731,7 @@ verb 3" >>$OPENVPN_CONF
 	echo "proto udp" >>$OPENVPN_CONF_PATH/client-template.txt
 	echo "explicit-exit-notify" >>$OPENVPN_CONF_PATH/client-template.txt
 	echo "remote $IP $PORT
+dhcp-option DNS 192.168.44.1
 dev tun
 resolv-retry infinite
 nobind
@@ -897,7 +899,7 @@ function stopOpenVPN() {
 	clear
 	if [ "$TOGGLE01" = "Disable" ]; then
 		INPUT=$(cat text/disable_openvpn-text)
-		DISABLED_CHOICE=$(whiptail --nocancel --title "TorBox - INFO" --radiolist "$INPUT" 26 $MENU_WIDTH 2 \
+		DISABLED_CHOICE=$(whiptail --nocancel --title "TorBox - INFO" --radiolist "$INPUT" $MENU_HEIGHT_20 $MENU_WIDTH 2 \
 		"1" "Temporary   - Disable the OpenVPN server until next boot" OFF \
 		"2" "Permanently - Disable the OpenVPN server until enabled again" OFF 3>&1 1>&2 2>&3)
 		exitstatus=$?
@@ -1057,13 +1059,13 @@ else
 		INPUT=$(cat $TXT_DIR/openvpn_server-text)
 		if (whiptail --title "TorBox - INFO (scroll down!)" --defaultno --no-button "ON A REAL BOX" --yes-button "ON A CLOUD" --yesno --scrolltext "$INPUT" $MENU_HEIGHT_25 $MENU_WIDTH); then
 			exitstatus=$?
-			# exitstatus = 255 means that the ESC key was pressed / exitstatus = 1 is cancelled
-			if [ "$exitstatus" = "1" ] || [ "$exitstatus" = "255" ] ; then	sed -i "s/^ON_A_CLOUD=.*/ON_A_CLOUD=0/" ${RUNFILE}; exit 1 ; fi
+			# exitstatus = 255 means that the ESC key was pressed
+			if [ "$exitstatus" = "255" ] ; then	sed -i "s/^ON_A_CLOUD=.*/ON_A_CLOUD=0/" ${RUNFILE}; exit 1 ; fi
 			sed -i "s/^ON_A_CLOUD=.*/ON_A_CLOUD=1/" ${RUNFILE}
 		else
 			exitstatus=$?
 			# exitstatus = 255 means that the ESC key was pressed / exitstatus = 1 is cancelled
-			if [ "$exitstatus" = "1" ] || [ "$exitstatus" = "255" ] ; then	sed -i "s/^ON_A_CLOUD=.*/ON_A_CLOUD=0/" ${RUNFILE}; exit 1 ; fi
+			if [ "$exitstatus" = "255" ] ; then	sed -i "s/^ON_A_CLOUD=.*/ON_A_CLOUD=0/" ${RUNFILE}; exit 1 ; fi
 			sed -i "s/^ON_A_CLOUD=.*/ON_A_CLOUD=0/" ${RUNFILE}
 		fi
 		installOpenVPN

diff --git a/install/prepare_image.sh b/install/prepare_image.sh
@@ -2,7 +2,7 @@
 # shellcheck disable=SC2001
 
 # This file is a part of TorBox, an easy to use anonymizing router based on Raspberry Pi.
-# Copyright (C) 2023 Patrick Truffer
+# Copyright (C) 2024 Patrick Truffer
 # Contact: anonym@torbox.ch
 # Website: https://www.torbox.ch
 # Github:  https://github.com/radio24/TorBox