Bladeren bron

Return to tor debian package

Bob Mottram 8 jaren geleden
bovenliggende
commit
14307ee7e7
2 gewijzigde bestanden met toevoegingen van 3 en 21 verwijderingen
  1. 2
    12
      src/freedombone-image-customise
  2. 1
    9
      src/freedombone-utils-onion

+ 2
- 12
src/freedombone-image-customise Bestand weergeven

@@ -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

+ 1
- 9
src/freedombone-utils-onion Bestand weergeven

@@ -31,9 +31,6 @@
31 31
 # The maximum amount of traffic per day in gigabytes
32 32
 TOR_MAX_TRAFFIC_PER_DAY_GB=3
33 33
 
34
-TOR_PACKAGE_UPSTREAM='http://deb.torproject.org/torproject.org'
35
-TOR_GPG_KEY='A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89'
36
-
37 34
 HIDDEN_SERVICE_PATH='/var/lib/tor/hidden_service_'
38 35
 
39 36
 function add_email_hostname {
@@ -272,12 +269,7 @@ function install_tor {
272 269
         return
273 270
     fi
274 271
 
275
-    echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a /etc/apt/sources.list.d/tor.list
276
-    echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a /etc/apt/sources.list.d/tor.list
277
-    gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
278
-    gpg --export $TOR_GPG_KEY | sudo apt-key add -
279
-    apt-get update
280
-    apt-get -yq install tor deb.torproject.org-keyring
272
+    apt-get -yq install tor
281 273
     if [ ! -f /etc/tor/torrc ]; then
282 274
         echo 'Tor failed to install'
283 275
         exit 38259