free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return to tor debian package

This commit is contained in:
Bob Mottram 2017-06-14 11:52:05 +01:00
parent 68d73d5057
commit 14307ee7e7
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/freedombone-image-customise
View File

@ -954,12 +954,7 @@ EOF
if [[ $VARIANT == "usb" ]]; then
# tor
echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
chroot "$rootdir" gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
chroot "$rootdir" gpg --export $TOR_GPG_KEY | sudo apt-key add -
chroot "$rootdir" apt-get update
chroot "$rootdir" apt-get -yq install tor deb.torproject.org-keyring
chroot "$rootdir" apt-get -yq install tor
# xmpp client
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 {
chroot "$rootdir" apt-get -yq install fail2ban vim-common python3 unattended-upgrades
# Tor and ssh over tor
echo "deb $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
echo "deb-src $TOR_PACKAGE_UPSTREAM $DEBIAN_VERSION main" | sudo tee -a $rootdir/etc/apt/sources.list.d/tor.list
chroot "$rootdir" gpg --keyserver keys.gnupg.net --recv $TOR_GPG_KEY
chroot "$rootdir" gpg --export $TOR_GPG_KEY | sudo apt-key add -
chroot "$rootdir" apt-get update
chroot "$rootdir" apt-get -yq install tor deb.torproject.org-keyring connect-proxy
chroot "$rootdir" apt-get -yq install tor connect-proxy
chroot "$rootdir" connect-proxy
sed -i 's|#Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc
sed -i 's|Log notice file.*|Log notice file /dev/null|g' $rootdir/etc/tor/torrc

10
src/freedombone-utils-onion
View File

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