From 1e681ae3cbbeb560797ea77f9667c2ba406c9018 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Mon, 1 Oct 2018 17:10:38 -0700
Subject: [PATCH] simpler keyring setup

---
 sync.run | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/sync.run b/sync.run
index 61b1bfc..f33715d 100644
--- a/sync.run
+++ b/sync.run
@@ -21,19 +21,6 @@ sleep 1 # prevent cpu spike on looping
 
 export MIRROR_DIR=/var/lib/ubuntumirror
 export IPFS_PATH=/var/lib/ipfs
-#export KEYID=790BC7277767219C42C86F933B4FE6ACC0B21F32
-
-export GNUPGHOME=/etc/debmirror/ubuntu
-mkdir -p $GNUPGHOME
-chmod go-rwx $GNUPGHOME
-
-
-gpg --no-default-keyring --keyring $GNUPGHOME/trustedkeys.gpg --import /usr/share/keyrings/ubuntu-archive-keyring.gpg
-
-#gpg --recv-key $KEYID
-#gpg --export $KEYID > $GNUPGHOME/trustedkeys.kbx
-
-chown -R ipfs:ipfs $GNUPGHOME
 
 if [[ ! -d $MIRROR_DIR ]]; then
     mkdir -p $MIRROR_DIR
@@ -42,7 +29,6 @@ fi
 
 chpst -u ipfs /bin/bash << '__EOF__'
 
-export GNUPGHOME=/etc/debmirror/ubuntu
 export IPFS=/usr/local/bin/ipfs
 export HOME=/home/ipfs
 export IPFS_FD_MAX=4096
@@ -52,6 +38,7 @@ $IPFS config --json Experimental.FilestoreEnabled true
 echo "Synchronizing with the main Ubuntu mirror."
 
 debmirror \
+    --keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg \
 	-a ${MIRROR_ARCHITECTURES:-amd64} \
 	--no-source \
 	-s ${MIRROR_CATEGORIES:-main,universe,multiverse,restricted} \