浏览代码

Show gpg batch files

Bob Mottram 8 年前
父节点
当前提交
d20fb4b49a
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. 2
    0
      src/freedombone-base-email
  2. 2
    0
      src/freedombone-utils-backup

+ 2
- 0
src/freedombone-base-email 查看文件

@@ -1626,9 +1626,11 @@ function configure_gpg {
1626 1626
         echo 'Key-Type: eddsa' > /home/$MY_USERNAME/gpg-genkey.conf
1627 1627
         echo 'Key-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
1628 1628
         echo 'Subkey-Type: eddsa' >> /home/$MY_USERNAME/gpg-genkey.conf
1629
+        echo 'Subkey-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
1629 1630
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1630 1631
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1631 1632
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1633
+        cat /home/$MY_USERNAME/gpg-genkey.conf
1632 1634
         if [ -f $IMAGE_PASSWORD_FILE ]; then
1633 1635
             echo "Passphrase: $(printf `cat $IMAGE_PASSWORD_FILE`)" >> /home/$MY_USERNAME/gpg-genkey.conf
1634 1636
         else

+ 2
- 0
src/freedombone-utils-backup 查看文件

@@ -68,10 +68,12 @@ function configure_backup_key {
68 68
         echo 'Key-Type: eddsa' > /home/$MY_USERNAME/gpg-genkey.conf
69 69
         echo 'Key-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
70 70
         echo 'Subkey-Type: eddsa' >> /home/$MY_USERNAME/gpg-genkey.conf
71
+        echo 'Subkey-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
71 72
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
72 73
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
73 74
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
74 75
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
76
+        cat /home/$MY_USERNAME/gpg-genkey.conf
75 77
         echo "Passphrase: $BACKUP_DUMMY_PASSWORD" >> /home/$MY_USERNAME/gpg-genkey.conf
76 78
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
77 79
         echo $'Backup key does not exist. Creating it.'