Ver código fonte

Installing tor from backports

Bob Mottram 7 anos atrás
pai
commit
21468a0547
2 arquivos alterados com 7 adições e 4 exclusões
  1. 3
    2
      src/freedombone-image-customise
  2. 4
    2
      src/freedombone-utils-onion

+ 3
- 2
src/freedombone-image-customise Ver arquivo

1623
 
1623
 
1624
     if [[ "$VARIANT" == "usb" ]]; then
1624
     if [[ "$VARIANT" == "usb" ]]; then
1625
         # tor
1625
         # tor
1626
-        chroot "$rootdir" apt-get -yq install tor
1626
+        chroot "$rootdir" apt-get -yq -t stretch-backports install tor
1627
 
1627
 
1628
         # xmpp client
1628
         # xmpp client
1629
         chroot "$rootdir" echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list
1629
         chroot "$rootdir" echo "deb ftp://ftp.gajim.org/debian unstable main" > /etc/apt/sources.list.d/gajim.list
1756
     chroot "$rootdir" apt-get -yq install vim-common python3 unattended-upgrades
1756
     chroot "$rootdir" apt-get -yq install vim-common python3 unattended-upgrades
1757
 
1757
 
1758
     # Tor and ssh over tor
1758
     # Tor and ssh over tor
1759
-    chroot "$rootdir" apt-get -yq install tor connect-proxy
1759
+    chroot "$rootdir" apt-get -yq -t stretch-backports install tor
1760
+    chroot "$rootdir" apt-get -yq install connect-proxy
1760
     chroot "$rootdir" connect-proxy
1761
     chroot "$rootdir" connect-proxy
1761
     sed -i 's|#Log notice file.*|Log notice file /dev/null|g' "$rootdir/etc/tor/torrc"
1762
     sed -i 's|#Log notice file.*|Log notice file /dev/null|g' "$rootdir/etc/tor/torrc"
1762
     sed -i 's|Log notice file.*|Log notice file /dev/null|g' "$rootdir/etc/tor/torrc"
1763
     sed -i 's|Log notice file.*|Log notice file /dev/null|g' "$rootdir/etc/tor/torrc"

+ 4
- 2
src/freedombone-utils-onion Ver arquivo

224
     if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
224
     if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
225
         return
225
         return
226
     fi
226
     fi
227
-    apt-get -yq install tor connect-proxy
227
+    echo 'N' | apt-get -yq -t stretch-backports install tor
228
+    apt-get -yq install connect-proxy
228
     if ! grep -q 'Host *.onion' "/home/$MY_USERNAME/.ssh/config"; then
229
     if ! grep -q 'Host *.onion' "/home/$MY_USERNAME/.ssh/config"; then
229
         if [ ! -d "/home/$MY_USERNAME/.ssh" ]; then
230
         if [ ! -d "/home/$MY_USERNAME/.ssh" ]; then
230
             mkdir "/home/$MY_USERNAME/.ssh"
231
             mkdir "/home/$MY_USERNAME/.ssh"
339
     if [[ $ROUTE_THROUGH_TOR != "yes" ]]; then
340
     if [[ $ROUTE_THROUGH_TOR != "yes" ]]; then
340
         return
341
         return
341
     fi
342
     fi
342
-    apt-get -yq install tor tor-arm
343
+    echo 'N' | apt-get -yq -t stretch-backports install tor
344
+    echo 'N' | apt-get -yq -t stretch-backports install tor-arm
343
 
345
 
344
     ### set variables
346
     ### set variables
345
     # Destinations you don't want routed through Tor
347
     # Destinations you don't want routed through Tor