From 32d9ebad9b99869cbd5a0bf7f6ce8bc40a35002c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 23 Aug 2018 15:44:01 +0100
Subject: [PATCH] Ensure that any previous tor keys are removed before
installing
---
src/freedombone-factory-reset | 9 ---------
src/freedombone-utils-onion | 9 +++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/freedombone-factory-reset b/src/freedombone-factory-reset
index 5c91aeada..71380ab50 100755
--- a/src/freedombone-factory-reset
+++ b/src/freedombone-factory-reset
@@ -159,15 +159,6 @@ awk '$5 > 2000' /etc/ssh/moduli > ~/moduli
mv ~/moduli /etc/ssh/moduli
echo $'ssh small moduli removed'
-# regenerate tor keys
-systemctl stop tor
-$REMOVE_PACKAGES tor
-if [ -d /var/lib/tor ]; then
- rm -rf /var/lib/tor
-fi
-$INSTALL_PACKAGES_BACKPORTS tor
-echo $'Tor keys regenerated'
-
$REMOVE_UNUSED_PACKAGES
$CLEAN_PACKAGES
/bin/rm -rf /var/lib/apt/lists/*
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index be1664c01..c464f2b6d 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -346,6 +346,15 @@ function install_tor {
return
fi
+ # ensure that any previous keys are removed
+ if [ -d /var/lib/tor ]; then
+ $REMOVE_PACKAGES tor
+ rm -rf /var/lib/tor
+ fi
+ if [ -d /etc/torrc.d ]; then
+ rm -rf /etc/torrc.d/*
+ fi
+
$INSTALL_PACKAGES_BACKPORTS tor
if [ ! -f /etc/tor/torrc ]; then
echo 'Tor failed to install'
--
GitLab