浏览代码

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

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

+ 13
- 0
src/freedombone-app-keyserver 查看文件

@@ -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
 

+ 2
- 0
src/freedombone-upgrade 查看文件

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