Merge commit '77e9f4525d9cd43c16702666ec89e3c0ca5c2fbb'

backup.conf

@@ -20,28 +20,6 @@ backup:
             # [passive]
             min-percent: 60
             or_ac-connected: true
-        
-        network:
-            # [active] Maximum number of Network-hops (measured using traceroute) the server can be "away" (usually 1 for local only)
-            max_hops: 1
-
-        time: ## TODO ##
-            # Minimum time to wait after the system has been booted [in seconds]
-            min_start: 1800
-            
-        concurrent_performance: ## TODO ##
-            # [passive] Load as reported by the linux-system
-            load:
-                max: 4
-                # time-frame (1, 5, 15)
-                time: 1
-            # [passive] observed network-speed
-            network: ## TODO ##
-                # time to measure network-speed [in seconds]
-                measure-time: 0
-                # max AVG-speed in KB/s
-                max_download:   1024
-                max_upload:     1024
 
     # How old should the previous backup be so we do another one [in seconds]
     backup-age: 64800