Merge pull request #3479 from dachary/wip-missed-journalist-notification

journalist notifications: allow 30 minutes variance in reboot times

install_files/ansible-base/group_vars/staging.yml

@@ -64,3 +64,4 @@ install_local_packages: true
 # the Apache service is configured correctly.
 securedrop_app_install_from_repo: False
 
+daily_reboot_time: 4 # An integer between 0 and 23

install_files/ansible-base/roles/app/tasks/setup_cron.yml

@@ -20,6 +20,7 @@
   cron:
     name: Update the number of submissions in the past 24h
     job: "{{ securedrop_code }}/manage.py were-there-submissions-today"
-    special_time: daily
+    # 0 -> 23, 1 -> 0, 2 -> 1, ... 23 -> 22
+    hour: "{{ (daily_reboot_time + 23) % 24 }}"
   tags:
     - cron

install_files/ansible-base/roles/ossec/files/process_submissions_today.sh

@@ -17,8 +17,18 @@ function main() {
 function modified_in_the_past_24h() {
     local stamp
     stamp="$1"
+    #
+    # 24h is 1440 minutes but we subtract 30min to avoid the following race condition
+    #
+    # - machine reboots
+    # - notification sent
+    # - machine reboots 24h later but reboots 1 minute faster than the previous day
+    # - notification is sent 23h59 minutes after the last one and suppressed
+    #
+    local one_day
+    one_day=1410
     test -f "${stamp}" && \
-        find "${stamp}" -mtime -1 | \
+        find "${stamp}" -mmin "-${one_day}" | \
             grep --quiet "${stamp}"
 }