free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing gpg key creation

This commit is contained in:
Bob Mottram 2014-09-23 18:01:18 +01:00
parent 245a43c40c
commit 7b76b98e6e
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
install-freedombone.sh
View File

@ -860,28 +860,22 @@ function configure_gpg {
echo "GPG private key file $MY_GPG_PRIVATE_KEY was not found" echo "GPG private key file $MY_GPG_PRIVATE_KEY was not found"
exit 6 exit 6
fi fi
su - $MY_USERNAME gpg --import $MY_GPG_PUBLIC_KEY su -c "gpg --import $MY_GPG_PUBLIC_KEY" - $MY_USERNAME
su - $MY_USERNAME gpg --allow-secret-key-import --import $MY_GPG_PRIVATE_KEY su -c "gpg --allow-secret-key-import --import $MY_GPG_PRIVATE_KEY" - $MY_USERNAME
# for security ensure that the private key file doesn't linger around # for security ensure that the private key file doesn't linger around
shred -zu $MY_GPG_PRIVATE_KEY shred -zu $MY_GPG_PRIVATE_KEY
else else
# Generate a GPG key # Generate a GPG key
umask 0277 echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
cat << EOF > /tmp/$MY_USERNAME-gpg-genkey.conf echo 'Key-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
%echo Generating a GPG key echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
Key-Type: RSA echo 'Subkey-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
Key-Length: 4096 echo "Name-Real: `hostname --fqdn`" >> /home/$MY_USERNAME/gpg-genkey.conf
Subkey-Type: ELG-E echo "Name-Email: $MY_USERNAME@`hostname --fqdn`" >> /home/$MY_USERNAME/gpg-genkey.conf
Subkey-Length: 4096 echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
Name-Real: `hostname --fqdn` chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
Name-Email: $MY_USERNAME@`hostname --fqdn` su -c "gpg --batch --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
Expire-Date: 0 shred -zu /home/$MY_USERNAME/gpg-genkey.conf
%commit
%echo Done
EOF
umask 0002
su $MY_USERNAME gpg --batch --gen-key /tmp/$MY_USERNAME-gpg-genkey.conf > gpg-keygen.log 2> gpg-keygen_error.log
shred -zu /tmp/$MY_USERNAME-gpg-genkey.conf
fi fi
echo 'configure_gpg' >> $COMPLETION_FILE echo 'configure_gpg' >> $COMPLETION_FILE