浏览代码

Edit keyserver sync servers

Bob Mottram 7 年前
父节点
当前提交
8c12c0f195
共有 1 个文件被更改,包括 23 次插入15 次删除
  1. 23
    15
      src/freedombone-app-keyserver

+ 23
- 15
src/freedombone-app-keyserver 查看文件

@@ -56,6 +56,15 @@ function configure_firewall_for_keyserver {
56 56
     mark_completed $FUNCNAME
57 57
 }
58 58
 
59
+function keyserver_reset_database {
60
+    if [ -d /var/lib/sks/DB ]; then
61
+        rm -rf /var/lib/sks/DB
62
+    fi
63
+    sks build
64
+    chown -Rc debian-sks: /var/lib/sks
65
+    systemctl restart sks
66
+}
67
+
59 68
 function logging_on_keyserver {
60 69
     echo -n ''
61 70
 }
@@ -192,7 +201,7 @@ function keyserver_import_keys {
192 201
 
193 202
     cd /var/lib/sks
194 203
     echo $'Building the keyserver database from the downloaded dump'
195
-    sks build
204
+    keyserver_reset_database
196 205
 }
197 206
 
198 207
 function keyserver_sync {
@@ -243,6 +252,12 @@ function keyserver_sync {
243 252
            --msgbox $"Keyserver added" 6 40
244 253
 }
245 254
 
255
+function keyserver_edit {
256
+    editor /etc/sks/membership
257
+    chown -Rc debian-sks: /etc/sks/membership
258
+    systemctl restart sks
259
+}
260
+
246 261
 function configure_interactive_keyserver {
247 262
     while true
248 263
     do
@@ -250,10 +265,11 @@ function configure_interactive_keyserver {
250 265
         trap "rm -f $data" 0 1 2 5 15
251 266
         dialog --backtitle $"Freedombone Control Panel" \
252 267
                --title $"SKS Keyserver" \
253
-               --radiolist $"Choose an operation:" 11 70 3 \
268
+               --radiolist $"Choose an operation:" 12 70 4 \
254 269
                1 $"Sync with other keyserver" off \
255
-               2 $"Import public keys database" off \
256
-               3 $"Exit" on 2> $data
270
+               2 $"Edit sync keyservers" off \
271
+               3 $"Import public keys database" off \
272
+               4 $"Exit" on 2> $data
257 273
         sel=$?
258 274
         case $sel in
259 275
             1) return;;
@@ -261,21 +277,13 @@ function configure_interactive_keyserver {
261 277
         esac
262 278
         case $(cat $data) in
263 279
             1) keyserver_sync;;
264
-            2) keyserver_import_keys;;
265
-            3) break;;
280
+            2) keyserver_edit;;
281
+            3) keyserver_import_keys;;
282
+            4) break;;
266 283
         esac
267 284
     done
268 285
 }
269 286
 
270
-function keyserver_reset_database {
271
-    if [ -d /var/lib/sks/DB ]; then
272
-        rm -rf /var/lib/sks/DB
273
-    fi
274
-    sks build
275
-    chown -Rc debian-sks: /var/lib/sks
276
-    systemctl restart sks
277
-}
278
-
279 287
 function install_keyserver {
280 288
     apt-get -qy install build-essential gcc ocaml libdb-dev wget sks
281 289
     keyserver_reset_database