aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-12-20 13:56:12 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-12-20 13:56:12 -0300
commit2b80e526539698f9315eea1d0b5a0834b2519d94 (patch)
treea32c02ce58caec3e1bf32e12667132748a56f1e1
parent4bdba1917d6e247c1a54e78d9db14bf28e115e11 (diff)
downloadkvmx-2b80e526539698f9315eea1d0b5a0834b2519d94.tar.gz
kvmx-2b80e526539698f9315eea1d0b5a0834b2519d94.tar.bz2
Fix: provision: move tor installation to web-basic
-rwxr-xr-xshare/provision/debian/web-basic4
-rwxr-xr-xshare/provision/debian/web-full3
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