summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-09-12 12:56:29 +0200
committeranonym <anonym@riseup.net>2016-02-09 17:31:46 +0100
commit312941d551505cbefcd512cae3c9364fdf0c6f72 (patch)
tree7cb81977139334c7d89e46b0368b8962c2baa8d4
parent695ccf8a98a7b6b883d3bcc7aeec2f5d8b8e0429 (diff)
Move Torbutton env configuration int the tor-browser script.
... instead of polluting the complete environment with it.
-rw-r--r--config/chroot_local-includes/etc/environment11
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tor-browser12
2 files changed, 12 insertions, 11 deletions
diff --git a/config/chroot_local-includes/etc/environment b/config/chroot_local-includes/etc/environment
index 2667880..8c99aff 100644
--- a/config/chroot_local-includes/etc/environment
+++ b/config/chroot_local-includes/etc/environment
@@ -1,16 +1,5 @@
SOCKS_SERVER=127.0.0.1:9050
SOCKS5_SERVER=127.0.0.1:9050
-# Allow Torbutton access to the control port filter (for new identity).
-# Setting a password is required, otherwise Torbutton attempts to
-# read the authentication cookie file instead, which fails.
-TOR_CONTROL_HOST='127.0.0.1'
-TOR_CONTROL_PORT='9052'
-TOR_CONTROL_PASSWD='passwd'
-# Hide Torbutton's "Tor Network Settings..." context menu entry since
-# it doesn't work in Tails, and we deal with those configurations
-# strictly through Tor Launcher.
-TOR_NO_DISPLAY_NETWORK_SETTINGS='yes'
-
# Port that the monkeysphere validation agent listens on
MSVA_PORT='6136'
diff --git a/config/chroot_local-includes/usr/local/bin/tor-browser b/config/chroot_local-includes/usr/local/bin/tor-browser
index 90c5739..cb38ccf 100755
--- a/config/chroot_local-includes/usr/local/bin/tor-browser
+++ b/config/chroot_local-includes/usr/local/bin/tor-browser
@@ -20,6 +20,18 @@ PROFILE="${HOME}/.tor-browser/profile.default"
# Import exec_firefox() and configure_best_tor_browser_locale()
. /usr/local/lib/tails-shell-library/tor-browser.sh
+# Allow Torbutton access to the control port filter (for new identity).
+# Setting a password is required, otherwise Torbutton attempts to
+# read the authentication cookie file instead, which fails.
+export TOR_CONTROL_HOST='127.0.0.1'
+export TOR_CONTROL_PORT='9052'
+export TOR_CONTROL_PASSWD='passwd'
+# Hide Torbutton's "Tor Network Settings..." context menu entry since
+# it doesn't work in Tails, and we deal with those configurations
+# strictly through Tor Launcher.
+export TOR_NO_DISPLAY_NETWORK_SETTINGS='yes'
+
+
ask_for_confirmation() {
# Skip dialog if user is already running Tor Browser:
if pgrep -u amnesia -f "${TBB_INSTALL}/firefox" ; then