|
@@ -954,12 +954,7 @@ EOF
|
954
|
954
|
|
955
|
955
|
if [[ $VARIANT == "usb" ]]; then
|
956
|
956
|
# tor
|
957
|
|
- echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
|
958
|
|
- echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
|
959
|
|
- chroot "$rootdir" gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
|
960
|
|
- chroot "$rootdir" gpg --export $TOR_GPG_KEY | sudo apt-key add -
|
961
|
|
- chroot "$rootdir" apt-get update
|
962
|
|
- chroot "$rootdir" apt-get -yq install tor deb.torproject.org-keyring
|
|
957
|
+ chroot "$rootdir" apt-get -yq install tor
|
963
|
958
|
|
964
|
959
|
# xmpp client
|
965
|
960
|
chroot "$rootdir" echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list
|
|
@@ -1082,12 +1077,7 @@ function image_setup_utils {
|
1082
|
1077
|
chroot "$rootdir" apt-get -yq install fail2ban vim-common python3 unattended-upgrades
|
1083
|
1078
|
|
1084
|
1079
|
# Tor and ssh over tor
|
1085
|
|
- echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
|
1086
|
|
- echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
|
1087
|
|
- chroot "$rootdir" gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
|
1088
|
|
- chroot "$rootdir" gpg --export $TOR_GPG_KEY | sudo apt-key add -
|
1089
|
|
- chroot "$rootdir" apt-get update
|
1090
|
|
- chroot "$rootdir" apt-get -yq install tor deb.torproject.org-keyring connect-proxy
|
|
1080
|
+ chroot "$rootdir" apt-get -yq install tor connect-proxy
|
1091
|
1081
|
chroot "$rootdir" connect-proxy
|
1092
|
1082
|
sed -i 's|#Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc
|
1093
|
1083
|
sed -i 's|Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc
|