From 79cfba462d90f686422f0ebb26c000aa9f28098f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 28 Jul 2017 21:39:29 +0100 Subject: [PATCH] Download keyserver dump using date Because downloading the full data will likely take longer than a day --- src/freedombone-app-keyserver | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/freedombone-app-keyserver b/src/freedombone-app-keyserver index d80293a1..829b3838 100755 --- a/src/freedombone-app-keyserver +++ b/src/freedombone-app-keyserver @@ -39,7 +39,6 @@ KEYSERVER_PORT=11371 KEYSERVER_ONION_PORT=8122 KEYSERVER_DOMAIN_NAME= KEYSERVER_CODE= -KEYSERVER_DUMP_URL="https://keyserver.mattrude.com/dump/current/" keyserver_variables=(ONION_ONLY MY_USERNAME @@ -139,7 +138,7 @@ function keyserver_import_keys { dialog --title $"Import public keys database" \ --backtitle $"Freedombone Control Panel" \ --defaultno \ - --yesno $"\nThis will download multiple gigabytes of data and so will take a long time.\n\nContinue?" 10 60 + --yesno $"\nThis will download many gigabytes of data and so depending on your bandwidth it could take several days.\n\nContinue?" 10 60 sel=$? case $sel in 1) return;; @@ -149,7 +148,9 @@ function keyserver_import_keys { mkdir -p /var/lib/sks/dump fi cd /var/lib/sks/dump - echo $'Getting keyserver dump. This may take a few hours or longer, so be patient.' + echo $'Getting keyserver dump. This may take a few days or longer, so be patient.' + rm -rf cd /var/lib/sks/dump/* + KEYSERVER_DUMP_URL="https://keyserver.mattrude.com/dump/$(date +%F)/" wget -crp -e robots=off --level=1 --cut-dirs=3 -nH \ -A pgp,txt $KEYSERVER_DUMP_URL