|
@@ -6290,6 +6290,10 @@ function configure_imap {
|
6290
|
6290
|
fi
|
6291
|
6291
|
sed -i 's|mail_location =.*|mail_location = maildir:~/Maildir:LAYOUT=fs|g' /etc/dovecot/conf.d/10-mail.conf
|
6292
|
6292
|
|
|
6293
|
+ # This long notify interval makes the system more suited for use with
|
|
6294
|
+ # battery powered mobile devices
|
|
6295
|
+ sed -i 's|#imap_idle_notify_interval =.*|imap_idle_notify_interval = 29|g' /etc/dovecot/conf.d/20-imap.conf
|
|
6296
|
+
|
6293
|
6297
|
service dovecot restart
|
6294
|
6298
|
echo 'configure_imap' >> $COMPLETION_FILE
|
6295
|
6299
|
}
|
|
@@ -6370,6 +6374,43 @@ function configure_imap_client_certs {
|
6370
|
6374
|
echo 'configure_imap_client_certs' >> $COMPLETION_FILE
|
6371
|
6375
|
}
|
6372
|
6376
|
|
|
6377
|
+function create_gpg_subkey {
|
|
6378
|
+ if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
|
6379
|
+ return
|
|
6380
|
+ fi
|
|
6381
|
+ if grep -Fxq "create_gpg_subkey" $COMPLETION_FILE; then
|
|
6382
|
+ return
|
|
6383
|
+ fi
|
|
6384
|
+ apt-get -y install gnupg
|
|
6385
|
+
|
|
6386
|
+ GPG_KEY_USAGE=$1
|
|
6387
|
+ if [[ $GPG_KEY_USAGE != "sign" && $GPG_KEY_USAGE != "auth" && $GPG_KEY_USAGE != "encrypt" ]]; then
|
|
6388
|
+ echo "Unknown subkey usage: $GPG_KEY_USAGE"
|
|
6389
|
+ echo 'Available types: sign|auth|encrypt'
|
|
6390
|
+ exit 14783
|
|
6391
|
+ fi
|
|
6392
|
+
|
|
6393
|
+ KEYGRIP=$(gpg --fingerprint --fingerprint $MY_EMAIL_ADDRESS | grep fingerprint | tail -1 | cut -d= -f2 | sed -e 's/ //g')
|
|
6394
|
+
|
|
6395
|
+ # Generate a GPG subkey
|
|
6396
|
+ # Here a 2048bit length is used to be compatible with yubikey
|
|
6397
|
+ echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
|
|
6398
|
+ echo "Key-Grip: $KEYGRIP" > /home/$MY_USERNAME/gpg-genkey.conf
|
|
6399
|
+ echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
|
|
6400
|
+ echo 'Subkey-Length: 2048' >> /home/$MY_USERNAME/gpg-genkey.conf
|
|
6401
|
+ echo "subkey-Usage: $GPG_KEY_USAGE" > /home/$MY_USERNAME/gpg-genkey.conf
|
|
6402
|
+ echo "Name-Real: $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
|
|
6403
|
+ echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
|
|
6404
|
+ echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
|
|
6405
|
+ echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
|
|
6406
|
+ chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
|
|
6407
|
+ su -c "gpg --batch --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
|
|
6408
|
+ shred -zu /home/$MY_USERNAME/gpg-genkey.conf
|
|
6409
|
+ MY_GPG_SUBKEY_ID=$(su -c "gpg --list-keys $MY_EMAIL_ADDRESS | grep 'pub '" - $MY_USERNAME | awk -F ' ' '{print $2}' | awk -F '/' '{print $2}')
|
|
6410
|
+
|
|
6411
|
+ echo 'create_gpg_subkey' >> $COMPLETION_FILE
|
|
6412
|
+}
|
|
6413
|
+
|
6373
|
6414
|
function configure_gpg {
|
6374
|
6415
|
if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
6375
|
6416
|
return
|