Selaa lähdekoodia

Don't report every gpg key refresh

Bob Mottram 9 vuotta sitten
vanhempi
commit
141aec2619
1 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 3
    3
      src/freedombone

+ 3
- 3
src/freedombone Näytä tiedosto

5327
     REFRESH_GPG_KEYS_SCRIPT=/usr/bin/update-gpg-keys
5327
     REFRESH_GPG_KEYS_SCRIPT=/usr/bin/update-gpg-keys
5328
     echo '#!/bin/bash' > $REFRESH_GPG_KEYS_SCRIPT
5328
     echo '#!/bin/bash' > $REFRESH_GPG_KEYS_SCRIPT
5329
     echo "if [ -f /usr/local/bin/${PROJECT_NAME}-sec ]; then" >> $REFRESH_GPG_KEYS_SCRIPT
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
     echo 'else' >> $REFRESH_GPG_KEYS_SCRIPT
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
     echo 'fi' >> $REFRESH_GPG_KEYS_SCRIPT
5333
     echo 'fi' >> $REFRESH_GPG_KEYS_SCRIPT
5334
     chmod +x $REFRESH_GPG_KEYS_SCRIPT
5334
     chmod +x $REFRESH_GPG_KEYS_SCRIPT
5335
 
5335
 
5338
     fi
5338
     fi
5339
     if ! grep -q "$REFRESH_GPG_KEYS_SCRIPT" /etc/crontab; then
5339
     if ! grep -q "$REFRESH_GPG_KEYS_SCRIPT" /etc/crontab; then
5340
         GPG_REFRESH_TIME=$(( RANDOM % 60 ))
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
         systemctl restart cron
5342
         systemctl restart cron
5343
     fi
5343
     fi
5344
 }
5344
 }