Ver código fonte

Extra keyserver settings

Bob Mottram 8 anos atrás
pai
commit
972e9b463b
1 arquivos alterados com 23 adições e 3 exclusões
  1. 23
    3
      src/freedombone-app-keyserver

+ 23
- 3
src/freedombone-app-keyserver Ver arquivo

@@ -452,11 +452,14 @@ function install_keyserver {
452 452
     sed -i "s|recon_address:.*|recon_address: 0.0.0.0|g" $sksconf_file
453 453
     sed -i 's|#hkp_address:.*|hkp_address: 127.0.0.1|g' $sksconf_file
454 454
     sed -i 's|hkp_address:.*|hkp_address: 127.0.0.1|g' $sksconf_file
455
+    sed -i "s|#from_addr:.*|from_addr: \"pgp-public-keys@$DEFAULT_DOMAIN_NAME\"|g" $sksconf_file
456
+    sed -i "s|from_addr:.*|from_addr: \"pgp-public-keys@$DEFAULT_DOMAIN_NAME\"|g" $sksconf_file
457
+    sed -i 's|#sendmail_cmd:|sendmail_cmd:|g' $sksconf_file
455 458
 
456
-    if ! grep -q "disable_mailsync" $sksconf_file; then
457
-        echo 'disable_mailsync:' >> $sksconf_file
459
+    if ! grep -q "#disable_mailsync" $sksconf_file; then
460
+        echo '#disable_mailsync:' >> $sksconf_file
458 461
     else
459
-        sed -i 's|#disable_mailsync:|disable_mailsync:|g' $sksconf_file
462
+        sed -i 's|disable_mailsync:|#disable_mailsync:|g' $sksconf_file
460 463
     fi
461 464
     if ! grep -q "membership_reload_interval:" $sksconf_file; then
462 465
         echo 'membership_reload_interval:     1' >> $sksconf_file
@@ -464,6 +467,19 @@ function install_keyserver {
464 467
         sed -i 's|#membership_reload_interval:.*|membership_reload_interval:     1|g' $sksconf_file
465 468
         sed -i 's|membership_reload_interval:.*|membership_reload_interval:     1|g' $sksconf_file
466 469
     fi
470
+    if ! grep -q "max_matches:" $sksconf_file; then
471
+        echo 'max_matches: 50' >> $sksconf_file
472
+    else
473
+        sed -i 's|#max_matches:.*|max_matches: 50|g' $sksconf_file
474
+        sed -i 's|max_matches:.*|max_matches: 50|g' $sksconf_file
475
+    fi
476
+    if ! grep -q "stat_hour:" $sksconf_file; then
477
+        echo "stat_hour: $((1 + RANDOM % 8))" >> $sksconf_file
478
+    else
479
+        sed -i "s|#stat_hour:.*|stat_hour: $((1 + RANDOM % 8))|g" $sksconf_file
480
+        sed -i "s|stat_hour:.*|stat_hour: $((1 + RANDOM % 8))|g" $sksconf_file
481
+    fi
482
+
467 483
     chown debian-sks: $sksconf_file
468 484
 
469 485
     if ! grep -q "hidden_service_sks" /etc/tor/torrc; then
@@ -635,6 +651,10 @@ function install_keyserver {
635 651
         rm /etc/sks/membership
636 652
     fi
637 653
 
654
+    if ! grep -q "pgp-public-keys" /etc/aliases; then
655
+        echo 'pgp-public-keys:      "|/usr/lib/sks/sks_add_mail /etc/sks"' >> /etc/aliases
656
+    fi
657
+
638 658
     systemctl enable sks
639 659
     systemctl restart sks
640 660
     systemctl restart nginx