From 18ad18de7dd8ff717a4461b0e4715eb88f4dac44 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 28 Jul 2017 19:57:21 +0100
Subject: [PATCH] Move database import to interactive

---
 src/freedombone-app-keyserver | 57 ++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/freedombone-app-keyserver b/src/freedombone-app-keyserver
index 67e4c647..cdd2ed02 100755
--- a/src/freedombone-app-keyserver
+++ b/src/freedombone-app-keyserver
@@ -143,9 +143,6 @@ function remove_keyserver {
     function_check remove_ddns_domain
     remove_ddns_domain $KEYSERVER_DOMAIN_NAME
 
-    groupdel -f keyserver
-    userdel -r keyserver
-
     remove_config_param KEYSERVER_DOMAIN_NAME
     remove_config_param KEYSERVER_CODE
     function_check remove_onion_service
@@ -159,6 +156,12 @@ function remove_keyserver {
     if [ -f /usr/bin/keyserver-stop ]; then
         rm /usr/bin/keyserver-stop
     fi
+    cd $INSTALL_DIR/keyserver
+    make uninstall
+    if [ -d /var/lib/sks ]; then
+        rm -rf /var/lib/sks
+    fi
+    rm -rf $INSTALL_DIR/keyserver
     groupdel -f keyserver
     userdel -r keyserver
 }
@@ -178,6 +181,42 @@ function install_interactive_keyserver {
     APP_INSTALLED=1
 }
 
+function keyserver_import_keys {
+    if [ ! -d /var/lib/sks/dump ]; then
+        mkdir -p /var/lib/sks/dump
+    fi
+    cd /var/lib/sks/dump
+    echo $'Getting keyserver dump. This may take a few hours, so be patient.'
+    wget -crp -e robots=off --level=1 --cut-dirs=3 -nH \
+         -A pgp,txt $KEYSERVER_DUMP_URL
+
+    cd /var/lib/sks
+    echo $'Building the keyserver database from the downloaded dump'
+    echo '2' | /usr/local/bin/sks_build.sh
+}
+
+function configure_interactive_keyserver {
+    while true
+    do
+        data=$(tempfile 2>/dev/null)
+        trap "rm -f $data" 0 1 2 5 15
+        dialog --backtitle $"Freedombone Control Panel" \
+               --title $"SKS Keyserver" \
+               --radiolist $"Choose an operation:" 10 70 2 \
+               1 $"Import keys database" off \
+               2 $"Exit" on 2> $data
+        sel=$?
+        case $sel in
+            1) return;;
+            255) return;;
+        esac
+        case $(cat $data) in
+            1) keyserver_import_keys;;
+            2) break;;
+        esac
+    done
+}
+
 function install_keyserver {
     apt-get -qy install build-essential gcc ocaml libdb-dev wget
 
@@ -279,18 +318,6 @@ function install_keyserver {
     echo '' >> $sksconf_file
     echo 'max_matches:                    500' >> $sksconf_file
 
-    if [ ! -d /var/lib/sks/dump ]; then
-        mkdir -p /var/lib/sks/dump
-    fi
-    cd /var/lib/sks/dump
-    echo $'Getting keyserver dump. This may take a few hours, so be patient.'
-    wget -crp -e robots=off --level=1 --cut-dirs=3 -nH \
-         -A pgp,txt $KEYSERVER_DUMP_URL
-
-    cd /var/lib/sks
-    echo $'Building the keyserver database from the downloaded dump'
-    echo '2' | /usr/local/bin/sks_build.sh
-
     KEYSERVER_ONION_HOSTNAME=$(add_onion_service keyserver 80 ${KEYSERVER_ONION_PORT})
 
     echo '#!/bin/sh' > /usr/bin/keyserver-start