From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 20 Dec 2022 16:56:12 +0000 (-0300)
Subject: Fix: provision: move tor installation to web-basic
X-Git-Tag: 0.1.0~35
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2b80e526539698f9315eea1d0b5a0834b2519d94;p=kvmx.git

Fix: provision: move tor installation to web-basic
---

diff --git a/share/provision/debian/web-basic b/share/provision/debian/web-basic
index 11a94b5..9cb6ad4 100755
--- 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 f16b032..5eeb32a 100755
--- 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