Fix: provision: move tor installation to web-basic

diff --git a/share/provision/debian/web-basic b/share/provision/debian/web-basic
index 11a94b58c2923d330d02e65a500238600a7910e7..9cb6ad4ed36c6558c46089e13d0d75ea0dda3c53 100755 (executable)
--- a/share/provision/debian/web-basic
+++ b/share/provision/debian/web-basic
@@ -36,6 +36,10 @@ $APT_INSTALL firefox-esr chromium
 # Use addons.mozilla.org version instead
 sudo apt-get remove -y webext-treestyletab
 
+# Lave Tor available if the user wants to route other software besides running Tor Browser
+#$APT_INSTALL tor
+sudo apps/trashman/trashman install tor
+
 # Mozilla configuration
 # Create this config using "cd $HOME && /bin/tar jcvf mozilla.tar.bz2 .mozilla"
 #if [ ! -d "$HOME/.mozilla" ]; then

diff --git a/share/provision/debian/web-full b/share/provision/debian/web-full
index f16b0323e602a936c2a06919a71d2742ead1f6cd..5eeb32a9376d2cf4faf6d436891d7299ad2c2cef 100755 (executable)
--- a/share/provision/debian/web-full
+++ b/share/provision/debian/web-full
@@ -32,9 +32,6 @@ $DIRNAME/web-basic $HOSTNAME $DOMAIN $MIRROR
 # Office Suite
 $APT_INSTALL libreoffice libreoffice-gkt3 gimp inkscape mat
 
-# Lave Tor available if the user wants to route other software besides running Tor Browser
-$APT_INSTALL tor
-
 # Luakit using stowpkg
 #if [ ! -x "$HOME/apps/stowpkg/tree/`uname -m`/bin/luakit" ]; then
 #  $APT_INSTALL make stow