Merge remote-tracking branch 'origin/release/0.6.8'0.6.8

Conflicts:
  locale/cs/app.po
  locale/sl/app.po
  locale/sq/app.po
  locale/tr/app.po
  locale/uk/app.po

2 files changed, 8 insertions, 4 deletions

diff --git a/script/check-recent-requests-sent b/script/check-recent-requests-sent
index 588c6b73a..7840dba4a 100755
--- a/script/check-recent-requests-sent
+++ b/script/check-recent-requests-sent
@@ -2,7 +2,7 @@
 
 cd "`dirname "$0"`"
 
-bundle exec ./runner 'EximLog.check_recent_requests_have_been_sent'
+bundle exec ./runner 'MailServerLog.check_recent_requests_have_been_sent'
 
 
 
diff --git a/script/load-exim-logs b/script/load-mail-server-logs
index 00b6b9825..9ff7a1401 100755
--- a/script/load-exim-logs
+++ b/script/load-mail-server-logs
@@ -2,6 +2,10 @@
 
 LOC=`dirname "$0"`
 
+cd "$LOC"/..
+source commonlib/shlib/deployfns
+read_conf config/general
+
 # Specific file if specified
 if [ x$1 != x ]
 then
@@ -10,14 +14,14 @@ then
        *) f=$(pwd)/$1 ;;
     esac
     cd "$LOC"
-    bundle exec ./runner 'EximLog.load_file("'$f'")'
+    bundle exec ./runner 'MailServerLog.load_file("'$f'")'
     exit
 fi
 
 # Load in last three days worth of logs (if they've been modified)
 cd "$LOC"
-LATEST=$( ls /var/log/exim4/exim-mainlog-* 2>/dev/null | sort | tail -3 )
+LATEST=$( ls $OPTION_MTA_LOG_PATH 2>/dev/null | sort | tail -3 )
 for X in $LATEST
 do
-    bundle exec ./runner 'EximLog.load_file("'$X'")'
+    bundle exec ./runner 'MailServerLog.load_file("'$X'")'
 done