diff options
| -rw-r--r-- | app/models/mail_server_log.rb | 2 | ||||
| -rw-r--r-- | config/crontab.ugly | 2 | ||||
| -rw-r--r-- | config/general.yml-example | 2 | ||||
| -rw-r--r-- | doc/INSTALL-exim4.md | 2 | ||||
| -rwxr-xr-x | script/load-mail-server-logs (renamed from script/load-exim-logs) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/app/models/mail_server_log.rb b/app/models/mail_server_log.rb index e925a2759..0ca604ae1 100644 --- a/app/models/mail_server_log.rb +++ b/app/models/mail_server_log.rb @@ -184,7 +184,7 @@ class MailServerLog < ActiveRecord::Base unless request_sent?(ir) # It's very important the envelope from is set for avoiding spam filter reasons - this # effectively acts as a check for that. - $stderr.puts("failed to find request sending in MTA logs for request id " + ir.id.to_s + " " + ir.url_title + " (check envelope from is being set to request address in Ruby, and load-exim-logs crontab is working)") # *** don't comment out this STDERR line, it is the point of the function! + $stderr.puts("failed to find request sending in MTA logs for request id " + ir.id.to_s + " " + ir.url_title + " (check envelope from is being set to request address in Ruby, and load-mail-server-logs crontab is working)") # *** don't comment out this STDERR line, it is the point of the function! ok = false end end diff --git a/config/crontab.ugly b/config/crontab.ugly index dc660e18f..085d68033 100644 --- a/config/crontab.ugly +++ b/config/crontab.ugly @@ -19,7 +19,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 09 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/alert-comment-on-request.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/alert-comment-on-request || echo "stalled?" # Only root can read the exim log files -31 * * * * root run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/load-exim-logs.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/load-exim-logs || echo "stalled?" +31 * * * * root run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/load-mail-server-logs.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/load-mail-server-logs || echo "stalled?" # Once a day, early morning 23 4 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/delete-old-things.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/delete-old-things || echo "stalled?" diff --git a/config/general.yml-example b/config/general.yml-example index 8f14fa88a..9646e45c8 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -173,7 +173,7 @@ GA_CODE: '' # Search path for external commandline utilities (such as pdftohtml, pdftk, unrtf) UTILITY_SEARCH_PATH: ["/usr/bin", "/usr/local/bin"] -# Path to your exim or postfix log files that will get sucked up by script/load-exim-logs +# Path to your exim or postfix log files that will get sucked up by script/load-mail-server-logs MTA_LOG_PATH: '/var/log/exim4/exim-mainlog-*' # Whether we are using "exim" or "postfix" for our MTA diff --git a/doc/INSTALL-exim4.md b/doc/INSTALL-exim4.md index 91c3506d3..e37da14ff 100644 --- a/doc/INSTALL-exim4.md +++ b/doc/INSTALL-exim4.md @@ -11,7 +11,7 @@ In `/etc/exim4/conf.d/main/04_alaveteli_options`: (The user ALAVETELI_USER should have write permissions on ALAVETELI_HOME). Note that the name and location of the log files created by Exim must match -what the `load-exim-logs` script expects, hence the need for the extra +what the `load-mail-server-logs` script expects, hence the need for the extra `log_file_path` setting. And the `check-recent-requests-sent` scripts expects the logs to contain the `from=<...>` envelope information, so we make the logs more verbose with `log_selector`. diff --git a/script/load-exim-logs b/script/load-mail-server-logs index 234aecd3b..234aecd3b 100755 --- a/script/load-exim-logs +++ b/script/load-mail-server-logs |