瀏覽代碼

Install tor daemon from backports

Bob Mottram 7 年之前
父節點
當前提交
32d52faf9f
共有 4 個文件被更改,包括 9 次插入3 次删除
  1. 1
    1
      src/freedombone-app-xmpp
  2. 1
    1
      src/freedombone-image-customise
  3. 6
    0
      src/freedombone-upgrade
  4. 1
    1
      src/freedombone-utils-onion

+ 1
- 1
src/freedombone-app-xmpp 查看文件

17
 # License
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
 # This program is free software: you can redistribute it and/or modify
22
 # This program is free software: you can redistribute it and/or modify
23
 # it under the terms of the GNU Affero General Public License as published by
23
 # it under the terms of the GNU Affero General Public License as published by

+ 1
- 1
src/freedombone-image-customise 查看文件

909
     chroot "$rootdir" apt-get -yq install apt-transport-https
909
     chroot "$rootdir" apt-get -yq install apt-transport-https
910
 
910
 
911
     # install tor as a possible way of routing traffic between internet gateways
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
     # dhcp daemon for hotspot on secondary wifi adapter
914
     # dhcp daemon for hotspot on secondary wifi adapter
915
     chroot "$rootdir" apt-get -yq install dnsmasq
915
     chroot "$rootdir" apt-get -yq install dnsmasq

+ 6
- 0
src/freedombone-upgrade 查看文件

97
         email_install_tls
97
         email_install_tls
98
         email_disable_chunking
98
         email_disable_chunking
99
         #defrag_filesystem
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
     fi
106
     fi
101
 fi
107
 fi
102
 
108
 

+ 1
- 1
src/freedombone-utils-onion 查看文件

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