|
@@ -64,6 +64,8 @@ function keyserver_watchdog {
|
64
|
64
|
keyserver_mail_subject_line=$"${PROJECT_NAME} keyserver warning"
|
65
|
65
|
keyserver_mail_subject_line_disabled=$"${PROJECT_NAME} keyserver disabled"
|
66
|
66
|
read_config_param KEYSERVER_DOMAIN_NAME
|
|
67
|
+
|
|
68
|
+ # check database size hourly
|
67
|
69
|
keyserver_watchdog_script=/etc/cron.hourly/keyserver-watchdog
|
68
|
70
|
echo '#!/bin/bash' > $keyserver_watchdog_script
|
69
|
71
|
echo "dirsize=\$(du /var/lib/sks/DB | awk -F ' ' '{print \$1}')" >> $keyserver_watchdog_script
|
|
@@ -80,6 +82,17 @@ function keyserver_watchdog {
|
80
|
82
|
echo 'fi' >> $keyserver_watchdog_script
|
81
|
83
|
|
82
|
84
|
chmod +x $keyserver_watchdog_script
|
|
85
|
+
|
|
86
|
+ # clear out log files daily
|
|
87
|
+ keyserver_watchdog_script=/etc/cron.daily/keyserver-db
|
|
88
|
+ echo '#!/bin/sh' > $keyserver_watchdog_script
|
|
89
|
+ echo 'if [ -d /var/lib/sks/DB ]; then' >> $keyserver_watchdog_script
|
|
90
|
+ echo ' cd /var/lib/sks/DB' >> $keyserver_watchdog_script
|
|
91
|
+ echo ' systemctl stop sks' >> $keyserver_watchdog_script
|
|
92
|
+ echo ' db_archive -d' >> $keyserver_watchdog_script
|
|
93
|
+ echo ' systemctl start sks' >> $keyserver_watchdog_script
|
|
94
|
+ echo 'fi' >> $keyserver_watchdog_script
|
|
95
|
+ chmod +x $keyserver_watchdog_script
|
83
|
96
|
}
|
84
|
97
|
|
85
|
98
|
|
|
@@ -668,12 +681,18 @@ function install_keyserver {
|
668
|
681
|
echo ' rewrite ^/d/(.*) /pks/lookup?op=get&options=mr&search=$1;' >> $keyserver_nginx_site
|
669
|
682
|
echo ' rewrite ^/download/(.*) /pks/lookup?op=get&options=mr&search=$1;' >> $keyserver_nginx_site
|
670
|
683
|
echo '' >> $keyserver_nginx_site
|
|
684
|
+ echo ' location / {' >> $keyserver_nginx_site
|
|
685
|
+ function_check nginx_limits
|
|
686
|
+ nginx_limits $KEYSERVER_DOMAIN_NAME '128k'
|
|
687
|
+ echo ' }' >> $keyserver_nginx_site
|
|
688
|
+ echo '' >> $keyserver_nginx_site
|
671
|
689
|
echo ' location /pks {' >> $keyserver_nginx_site
|
672
|
690
|
echo ' proxy_pass http://127.0.0.1:11373;' >> $keyserver_nginx_site
|
673
|
691
|
echo ' proxy_pass_header Server;' >> $keyserver_nginx_site
|
674
|
692
|
echo " add_header Via \"1.1 $KEYSERVER_DOMAIN_NAME:11371 (nginx)\";" >> $keyserver_nginx_site
|
675
|
693
|
echo ' proxy_ignore_client_abort on;' >> $keyserver_nginx_site
|
676
|
694
|
echo ' client_max_body_size 8m;' >> $keyserver_nginx_site
|
|
695
|
+ echo ' client_body_buffer_size 128k;' >> $keyserver_nginx_site
|
677
|
696
|
echo ' }' >> $keyserver_nginx_site
|
678
|
697
|
echo '}' >> $keyserver_nginx_site
|
679
|
698
|
echo '' >> $keyserver_nginx_site
|
|
@@ -715,12 +734,18 @@ function install_keyserver {
|
715
|
734
|
echo ' rewrite ^/d/(.*) /pks/lookup?op=get&options=mr&search=$1;' >> $keyserver_nginx_site
|
716
|
735
|
echo ' rewrite ^/download/(.*) /pks/lookup?op=get&options=mr&search=$1;' >> $keyserver_nginx_site
|
717
|
736
|
echo '' >> $keyserver_nginx_site
|
|
737
|
+ echo ' location / {' >> $keyserver_nginx_site
|
|
738
|
+ function_check nginx_limits
|
|
739
|
+ nginx_limits $KEYSERVER_DOMAIN_NAME '128k'
|
|
740
|
+ echo ' }' >> $keyserver_nginx_site
|
|
741
|
+ echo '' >> $keyserver_nginx_site
|
718
|
742
|
echo ' location /pks {' >> $keyserver_nginx_site
|
719
|
743
|
echo " proxy_pass http://127.0.0.1:11373;" >> $keyserver_nginx_site
|
720
|
744
|
echo ' proxy_pass_header Server;' >> $keyserver_nginx_site
|
721
|
745
|
echo " add_header Via \"1.1 $KEYSERVER_DOMAIN_NAME:11372 (nginx)\";" >> $keyserver_nginx_site
|
722
|
746
|
echo ' proxy_ignore_client_abort on;' >> $keyserver_nginx_site
|
723
|
747
|
echo ' client_max_body_size 8m;' >> $keyserver_nginx_site
|
|
748
|
+ echo ' client_body_buffer_size 128k;' >> $keyserver_nginx_site
|
724
|
749
|
echo ' }' >> $keyserver_nginx_site
|
725
|
750
|
echo '}' >> $keyserver_nginx_site
|
726
|
751
|
echo '' >> $keyserver_nginx_site
|
|
@@ -756,12 +781,18 @@ function install_keyserver {
|
756
|
781
|
echo ' rewrite ^/d/(.*) /pks/lookup?op=get&options=mr&search=$1;' >> $keyserver_nginx_site
|
757
|
782
|
echo ' rewrite ^/download/(.*) /pks/lookup?op=get&options=mr&search=$1;' >> $keyserver_nginx_site
|
758
|
783
|
echo '' >> $keyserver_nginx_site
|
|
784
|
+ echo ' location / {' >> $keyserver_nginx_site
|
|
785
|
+ function_check nginx_limits
|
|
786
|
+ nginx_limits $KEYSERVER_DOMAIN_NAME '128k'
|
|
787
|
+ echo ' }' >> $keyserver_nginx_site
|
|
788
|
+ echo '' >> $keyserver_nginx_site
|
759
|
789
|
echo ' location /pks {' >> $keyserver_nginx_site
|
760
|
790
|
echo " proxy_pass http://127.0.0.1:11373;" >> $keyserver_nginx_site
|
761
|
791
|
echo ' proxy_pass_header Server;' >> $keyserver_nginx_site
|
762
|
792
|
echo " add_header Via \"1.1 $KEYSERVER_DOMAIN_NAME:$KEYSERVER_ONION_PORT (nginx)\";" >> $keyserver_nginx_site
|
763
|
793
|
echo ' proxy_ignore_client_abort on;' >> $keyserver_nginx_site
|
764
|
794
|
echo ' client_max_body_size 8m;' >> $keyserver_nginx_site
|
|
795
|
+ echo ' client_body_buffer_size 128k;' >> $keyserver_nginx_site
|
765
|
796
|
echo ' }' >> $keyserver_nginx_site
|
766
|
797
|
echo '}' >> $keyserver_nginx_site
|
767
|
798
|
|