From 2b80e526539698f9315eea1d0b5a0834b2519d94 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 20 Dec 2022 13:56:12 -0300 Subject: Fix: provision: move tor installation to web-basic --- share/provision/debian/web-basic | 4 ++++ share/provision/debian/web-full | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) 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 -- cgit v1.2.3