Forward port housekeeping/schedule and expiry/expire legacy config

Netdisco/Changes

@@ -9,6 +9,7 @@
   [BUG FIXES]
 
   * Fix for device counts in VLAN Inventory report
+  * Forward port housekeeping/schedule and expiry/expire legacy config
 
 2.027007 - 2014-05-27
 

Netdisco/lib/App/Netdisco/Configuration.pm

@@ -47,9 +47,15 @@ setting('workers')->{queue} ||= 'PostgreSQL';
 setting('dns')->{hosts_file} ||= '/etc/hosts';
 setting('dns')->{no} ||= ['fe80::/64','169.254.0.0/16'];
 
+# cope with legacy config name
+config->{'schedule'} = config->{'housekeeping'}
+  if setting('housekeeping') and not setting('schedule');
+delete config->{'housekeeping'};
+
 # schedule expire used to be called expiry
 setting('schedule')->{expire} ||= setting('schedule')->{expiry}
   if setting('schedule') and exists setting('schedule')->{expiry};
+delete config->{'schedule'}->{'expiry'};
 
 # set max outstanding requests for AnyEvent::DNS
 $ENV{'PERL_ANYEVENT_MAX_OUTSTANDING_DNS'}