Browse Source

Clear out keyserver logs more frequently and make sure that sks daemon is stopped when clearing

Bob Mottram 7 years ago
parent
commit
a361727da6
2 changed files with 15 additions and 0 deletions
  1. 13
    0
      src/freedombone-app-keyserver
  2. 2
    0
      src/freedombone-upgrade

+ 13
- 0
src/freedombone-app-keyserver View File

64
     keyserver_mail_subject_line=$"${PROJECT_NAME} keyserver warning"
64
     keyserver_mail_subject_line=$"${PROJECT_NAME} keyserver warning"
65
     keyserver_mail_subject_line_disabled=$"${PROJECT_NAME} keyserver disabled"
65
     keyserver_mail_subject_line_disabled=$"${PROJECT_NAME} keyserver disabled"
66
     read_config_param KEYSERVER_DOMAIN_NAME
66
     read_config_param KEYSERVER_DOMAIN_NAME
67
+
68
+    # check database size hourly
67
     keyserver_watchdog_script=/etc/cron.hourly/keyserver-watchdog
69
     keyserver_watchdog_script=/etc/cron.hourly/keyserver-watchdog
68
     echo '#!/bin/bash' > $keyserver_watchdog_script
70
     echo '#!/bin/bash' > $keyserver_watchdog_script
69
     echo "dirsize=\$(du /var/lib/sks/DB | awk -F ' ' '{print \$1}')" >> $keyserver_watchdog_script
71
     echo "dirsize=\$(du /var/lib/sks/DB | awk -F ' ' '{print \$1}')" >> $keyserver_watchdog_script
80
     echo 'fi' >> $keyserver_watchdog_script
82
     echo 'fi' >> $keyserver_watchdog_script
81
 
83
 
82
     chmod +x $keyserver_watchdog_script
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
 

+ 2
- 0
src/freedombone-upgrade View File

70
 # remove any keyserver log files
70
 # remove any keyserver log files
71
 if [ -d /var/lib/sks/DB ]; then
71
 if [ -d /var/lib/sks/DB ]; then
72
     cd /var/lib/sks/DB
72
     cd /var/lib/sks/DB
73
+    systemctl stop sks
73
     db_archive -d
74
     db_archive -d
75
+    systemctl start sks
74
 fi
76
 fi
75
 
77
 
76
 if [ ! -d $PROJECT_DIR ]; then
78
 if [ ! -d $PROJECT_DIR ]; then