aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-12-20 13:52:03 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-12-20 13:52:03 -0300
commitee73a4b3e03ade37e54bdc758ae244df07c7f636 (patch)
tree99e7295724c1fea7e8ae91191c503f792225bd1f /share
parent63fab6a2fc236cece4c7af8cfc0c8d67b47f2822 (diff)
downloadtrashman-ee73a4b3e03ade37e54bdc758ae244df07c7f636.tar.gz
trashman-ee73a4b3e03ade37e54bdc758ae244df07c7f636.tar.bz2
Fix: trashman: tor: OpenPGP key location
Diffstat (limited to 'share')
-rwxr-xr-xshare/trashman/tor/unix/linux/debian/install7
1 files changed, 5 insertions, 2 deletions
diff --git a/share/trashman/tor/unix/linux/debian/install b/share/trashman/tor/unix/linux/debian/install
index 701a245..e88f92c 100755
--- a/share/trashman/tor/unix/linux/debian/install
+++ b/share/trashman/tor/unix/linux/debian/install
@@ -20,10 +20,13 @@ trashman_apt_install $REQUIREMENTS
DISTRIBUTION="`trashman_debian_major_version_name`"
cat <<-EOF > /etc/apt/sources.list.d/tor.list
- deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $DISTRIBUTION main
- deb-src [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $DISTRIBUTION main
+ deb [signed-by=/etc/apt/trusted.gpg.d/torproject.org.gpg] https://deb.torproject.org/torproject.org $DISTRIBUTION main
+ deb-src [signed-by=/etc/apt/trusted.gpg.d/torproject.org.gpg] https://deb.torproject.org/torproject.org $DISTRIBUTION main
EOF
+# Remove key from old location
+rm -f /usr/share/keyrings/tor-archive-keyring.gpg
+
#wget -O- https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor | tee /usr/share/keyrings/tor-archive-keyring.gpg >/dev/null
cp $SHARE/tor/unix/linux/debian/files/etc/apt/trusted.gpg.d/torproject.org.gpg /etc/apt/trusted.gpg.d/