瀏覽代碼

Don't report every gpg key refresh

Bob Mottram 8 年之前
父節點
當前提交
141aec2619
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3
    3
      src/freedombone

+ 3
- 3
src/freedombone 查看文件

@@ -5327,9 +5327,9 @@ function refresh_gpg_keys {
5327 5327
     REFRESH_GPG_KEYS_SCRIPT=/usr/bin/update-gpg-keys
5328 5328
     echo '#!/bin/bash' > $REFRESH_GPG_KEYS_SCRIPT
5329 5329
     echo "if [ -f /usr/local/bin/${PROJECT_NAME}-sec ]; then" >> $REFRESH_GPG_KEYS_SCRIPT
5330
-    echo "    /usr/bin/timeout 600 /usr/local/bin/${PROJECT_NAME}-sec --refresh yes > /dev/null" >> $REFRESH_GPG_KEYS_SCRIPT
5330
+    echo "    /usr/bin/timeout 600 /usr/local/bin/${PROJECT_NAME}-sec --refresh yes" >> $REFRESH_GPG_KEYS_SCRIPT
5331 5331
     echo 'else' >> $REFRESH_GPG_KEYS_SCRIPT
5332
-    echo "    /usr/bin/timeout 600 /usr/bin/${PROJECT_NAME}-sec --refresh yes > /dev/null" >> $REFRESH_GPG_KEYS_SCRIPT
5332
+    echo "    /usr/bin/timeout 600 /usr/bin/${PROJECT_NAME}-sec --refresh yes" >> $REFRESH_GPG_KEYS_SCRIPT
5333 5333
     echo 'fi' >> $REFRESH_GPG_KEYS_SCRIPT
5334 5334
     chmod +x $REFRESH_GPG_KEYS_SCRIPT
5335 5335
 
@@ -5338,7 +5338,7 @@ function refresh_gpg_keys {
5338 5338
     fi
5339 5339
     if ! grep -q "$REFRESH_GPG_KEYS_SCRIPT" /etc/crontab; then
5340 5340
         GPG_REFRESH_TIME=$(( RANDOM % 60 ))
5341
-        echo "$GPG_REFRESH_TIME            */$REFRESH_GPG_KEYS_HOURS *   *   *   root $REFRESH_GPG_KEYS_SCRIPT" >> /etc/crontab
5341
+        echo "$GPG_REFRESH_TIME            */$REFRESH_GPG_KEYS_HOURS *   *   *   root $REFRESH_GPG_KEYS_SCRIPT 2>&1 > /dev/null" >> /etc/crontab
5342 5342
         systemctl restart cron
5343 5343
     fi
5344 5344
 }