Rename housekeeping expiry task to be expire

Netdisco/Changes

@@ -11,6 +11,7 @@
   * Use daterange for IP Subnets (same as IP Inventory)
   * Run daemons as target binary's owning user (supports run control)
   * Clean up library path fiddling across all scripts
+  * Rename housekeeping expiry task to be expire
 
   [BUG FIXES]
 

Netdisco/lib/App/Netdisco.pm

@@ -50,6 +50,10 @@ setting('plugins')->{DBIC}->{daemon} = {
 setting('dns')->{no} ||= ['fe80::/64','169.254.0.0/16'];
 setting('dns')->{hosts_file} ||= '/etc/hosts';
 
+# housekeeping expire used to be called expiry
+setting('housekeeping')->{expire} ||= setting('housekeeping')->{expiry}
+  if exists setting('housekeeping')->{expiry};
+
 =head1 NAME
 
 App::Netdisco - An open source web-based network management tool.

Netdisco/lib/App/Netdisco/Daemon/Queue.pm

@@ -23,7 +23,7 @@ sub capacity_for {
 
   my $action_map = {
       Poller => [
-          qw/discoverall discover arpwalk arpnip macwalk macsuck nbtstat nbtwalk expiry/
+          qw/discoverall discover arpwalk arpnip macwalk macsuck nbtstat nbtwalk expire/
       ],
       Interactive => [qw/location contact portcontrol portname vlan power/],
   };

Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm

@@ -13,7 +13,7 @@ my $fqdn = hostfqdn || 'localhost';
 
 my $role_map = {
   (map {$_ => 'Poller'}
-      qw/discoverall discover arpwalk arpnip macwalk macsuck nbtstat nbtwalk expiry/),
+      qw/discoverall discover arpwalk arpnip macwalk macsuck nbtstat nbtwalk expire/),
   (map {$_ => 'Interactive'}
       qw/location contact portcontrol portname vlan power/)
 };

Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Expiry.pm

@@ -9,7 +9,7 @@ use Role::Tiny;
 use namespace::clean;
 
 # expire devices and nodes according to config
-sub expiry {
+sub expire {
   my ($self, $job) = @_;
 
   if (setting('expire_devices') and setting('expire_devices') > 0) {

Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm

@@ -15,7 +15,7 @@ my $jobactions = {
       arpwalk
       macwalk
       nbtwalk
-      expiry
+      expire
   /
 #    saveconfigs
 #    backup

Netdisco/lib/App/Netdisco/Manual/Configuration.pod

@@ -898,7 +898,7 @@ hour fields (which accept same types as C<cron> notation). For example:
        wday: 'mon-fri'
    nbtwalk:
      when: '0 8,13,21 * * *'
-   expiry:
+   expire:
      when: '20 23 * * *'
 
 Note that the "C<when>" fields default to "all" (i.e. "C<*>") when not

Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod

@@ -48,6 +48,10 @@ The Web and Backend daemons will also now drop privilege to the same user and
 group as their files on disk. This allows you to symlink the programs as
 run-control scripts, yet maintain non-root privilege status.
 
+The housekeeping task C<expiry> has been renamed to C<expire>. Old
+configuration will continue to work, but we recommend you rename this part of
+your C<housekeeping> configuration anyway.
+
 =head1 2.023000
 
 =head2 Incompatible Changes
@@ -93,7 +97,7 @@ Add the following to your "C<housekeeping>" configuration in
 C<deployment.yml>, to have a nightly check at 11:20pm:
 
   housekeeping:
-    expiry:
+    expire:
       when: '20 23 * * *'
 
 You should also configure one or more of C<expire_devices>, C<expire_nodes>,

Netdisco/share/config.yml

@@ -175,17 +175,17 @@ dns:
 
 #housekeeping:
 #  discoverall:
-#    when: '0 9 * * *'
+#    when: '5 7 * * *'
-#  arpwalk:
-#    when:
-#      min: 30
 #  macwalk:
 #    when:
-#      min: 15
+#      min: 20
-#      hour: '*/2'
+#  arpwalk:
-#      wday: 'mon-fri'
+#    when:
-#   nbtwalk:
+#      min: 50
-#     when: '0 8,13,21 * * *'
+#  nbtwalk:
+#    when: '0 8,13,21 * * *'
+#  expire:
+#    when: '20 23 * * *'
 
 # ---------------
 # DANCER INTERNAL

Netdisco/share/environments/deployment.yml

@@ -51,7 +51,7 @@ safe_password_store: true
 #      min: 50
 #  nbtwalk:
 #    when: '0 8,13,21 * * *'
-#  expiry:
+#  expire:
 #    when: '20 23 * * *'
 
 # increase the performance of parallel DNS resolution for node