diff --git a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg
index 370f5028eb..2274c55c6c 100644
--- a/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg
+++ b/roles/mirrormanager/frontend2/templates/mirrormanager2.cfg
@@ -75,6 +75,13 @@ MM_COOKIE_REQUIRES_HTTPS = True
 # Default: ``.MirrorManager``.
 MM_COOKIE_NAME = 'MirrorManager'
 
+# If this variable is set (and the directory exists) the crawler
+# will create per host log files in MM_LOG_DIR/crawler/<hostid>.log
+# which can the be used in the web interface by the mirror admins.
+# Other parts besides the crawler are also using this variable to
+# decide where to store log files.
+MM_LOG_DIR = '/var/log/mirrormanager'
+
 # If not specified the application will rely on the root_url when sending
 # emails, otherwise it will use this URL
 # Default: ``None``.
@@ -94,14 +101,17 @@ CRAWLER_RSYNC_PARAMETERS = '--no-motd --timeout 14400'
 # Configuration options used by the crons
 ###
 
-# If this variable is set (and the directory exists)
-# the crawler will create per host log files with <hostid>.log
-# which can the be used in the web interface by the mirror admins
-CRAWLER_LOG_DIR = '/var/log/mirrormanager/crawler'
-
 # Specify whether the crawler should send a report by email
 CRAWLER_SEND_EMAIL =  False
 
+# Specify additional rsync parameters for the crawler
+# --timeout 14400: abort rsync crawl after 4 hours
+CRAWLER_RSYNC_PARAMETERS = '--no-motd --timeout 14400'
+
+# If a host fails for CRAWLER_AUTO_DISABLE times in a row
+# the host will be disable automatically (user_active)
+CRAWLER_AUTO_DISABLE = 4
+
 umdl_master_directories = [
     {
         'type': 'directory',