simpler keyring setup

This commit is contained in:
Jeffrey Paul 2018-10-01 17:10:38 -07:00
parent a72575eef4
commit 1e681ae3cb
Signed by: sneak
GPG Key ID: 052443F4DF2A55C2

View File

@ -21,19 +21,6 @@ sleep 1 # prevent cpu spike on looping
export MIRROR_DIR=/var/lib/ubuntumirror export MIRROR_DIR=/var/lib/ubuntumirror
export IPFS_PATH=/var/lib/ipfs 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 if [[ ! -d $MIRROR_DIR ]]; then
mkdir -p $MIRROR_DIR mkdir -p $MIRROR_DIR
@ -42,7 +29,6 @@ fi
chpst -u ipfs /bin/bash << '__EOF__' chpst -u ipfs /bin/bash << '__EOF__'
export GNUPGHOME=/etc/debmirror/ubuntu
export IPFS=/usr/local/bin/ipfs export IPFS=/usr/local/bin/ipfs
export HOME=/home/ipfs export HOME=/home/ipfs
export IPFS_FD_MAX=4096 export IPFS_FD_MAX=4096
@ -52,6 +38,7 @@ $IPFS config --json Experimental.FilestoreEnabled true
echo "Synchronizing with the main Ubuntu mirror." echo "Synchronizing with the main Ubuntu mirror."
debmirror \ debmirror \
--keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg \
-a ${MIRROR_ARCHITECTURES:-amd64} \ -a ${MIRROR_ARCHITECTURES:-amd64} \
--no-source \ --no-source \
-s ${MIRROR_CATEGORIES:-main,universe,multiverse,restricted} \ -s ${MIRROR_CATEGORIES:-main,universe,multiverse,restricted} \