aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-12-09 09:09:07 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-12-09 09:09:07 -0300
commitfc76b9924021cf87598ee77bbf9de0c8609b1eec (patch)
treea0bf9ff62ef7f4e7f601adf2f3043d331f826c55
parent4ae03ec864ed657afad10379df2cee71d527966a (diff)
downloadtrashman-fc76b9924021cf87598ee77bbf9de0c8609b1eec.tar.gz
trashman-fc76b9924021cf87598ee77bbf9de0c8609b1eec.tar.bz2
Fix: use Tor package from trashman
-rwxr-xr-xshare/trashman/tor-transproxy/unix/linux/debian/install4
-rwxr-xr-xshare/trashman/tor/unix/linux/debian/install3
2 files changed, 5 insertions, 2 deletions
diff --git a/share/trashman/tor-transproxy/unix/linux/debian/install b/share/trashman/tor-transproxy/unix/linux/debian/install
index 125dc2d..9508091 100755
--- a/share/trashman/tor-transproxy/unix/linux/debian/install
+++ b/share/trashman/tor-transproxy/unix/linux/debian/install
@@ -11,7 +11,9 @@ SHARE="$1"
. $SHARE/trashman/debian || exit 1
# Dependencies
-trashman_apt_install tor iptables
+#trashman_apt_install tor iptables
+trashman_apt_install iptables
+trashman install tor
# Firewall config
cp $SHARE/tor-transproxy/unix/linux/debian/files/etc/network/if-pre-up.d/iptables /etc/network/if-pre-up.d/iptables
diff --git a/share/trashman/tor/unix/linux/debian/install b/share/trashman/tor/unix/linux/debian/install
index 71f1cb9..7a8055e 100755
--- a/share/trashman/tor/unix/linux/debian/install
+++ b/share/trashman/tor/unix/linux/debian/install
@@ -16,7 +16,8 @@ REQUIREMENTS="apt-transport-https wget gnupg"
trashman_apt_install_packages $REQUIREMENTS
# Additional parameters
-DISTRIBUTION="bullseye"
+#DISTRIBUTION="bullseye"
+DISTRIBUTION="`trashman_debian_major_version_name`"
cat <<-EOF > /etc/apt/sources.list.d/tor.list
deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $DISTRIBUTION main