Pārlūkot izejas kodu

Install tor daemon from backports

Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
32d52faf9f

+ 1
- 1
src/freedombone-app-xmpp Parādīt failu

@@ -17,7 +17,7 @@
17 17
 # License
18 18
 # =======
19 19
 #
20
-# Copyright (C) 2014-2017 Bob Mottram <bob@freedombone.net>
20
+# Copyright (C) 2014-2018 Bob Mottram <bob@freedombone.net>
21 21
 #
22 22
 # This program is free software: you can redistribute it and/or modify
23 23
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-image-customise Parādīt failu

@@ -909,7 +909,7 @@ initialise_mesh() {
909 909
     chroot "$rootdir" apt-get -yq install apt-transport-https
910 910
 
911 911
     # install tor as a possible way of routing traffic between internet gateways
912
-    chroot "$rootdir" apt-get -yq install tor
912
+    chroot "$rootdir" apt-get -yq -t stretch-backports install tor
913 913
 
914 914
     # dhcp daemon for hotspot on secondary wifi adapter
915 915
     chroot "$rootdir" apt-get -yq install dnsmasq

+ 6
- 0
src/freedombone-upgrade Parādīt failu

@@ -97,6 +97,12 @@ if [ -d $PROJECT_DIR ]; then
97 97
         email_install_tls
98 98
         email_disable_chunking
99 99
         #defrag_filesystem
100
+
101
+        # reinstall tor from backports
102
+        tor_version=$(tor --version)
103
+        if [[ "$tor_version" == *' 0.2'* ]]; then
104
+            apt-get -yq -t stretch-backports install tor
105
+        fi
100 106
     fi
101 107
 fi
102 108
 

+ 1
- 1
src/freedombone-utils-onion Parādīt failu

@@ -270,7 +270,7 @@ function install_tor {
270 270
         return
271 271
     fi
272 272
 
273
-    apt-get -yq install tor
273
+    apt-get -yq -t stretch-backports install tor
274 274
     if [ ! -f /etc/tor/torrc ]; then
275 275
         echo 'Tor failed to install'
276 276
         exit 38259