From 00b92f8f552e0ce93d11bdb71e47e283cc5d7826 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 28 Nov 2017 21:43:32 +0000
Subject: [PATCH] make scheduler config default/automatic

---
 share/config.yml                  | 30 ++++++++++++++++--------------
 share/environments/deployment.yml | 27 ++++++++++++++++++---------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/share/config.yml b/share/config.yml
index f0ecb523..b9c8892b 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -139,7 +139,9 @@ devices_no: []
 devices_only: []
 discover_no: []
 discover_only: []
-discover_no_type: []
+discover_no_type:
+  - '(?i)phone'
+  - '(?i)(?:wap|wireless)'
 discover_min_age: 0
 macsuck_no: []
 macsuck_only: []
@@ -225,19 +227,19 @@ dns:
   hosts_file: '/etc/hosts'
   no: ['group:__LOCAL_ADDRESSES__','169.254.0.0/16']
 
-#schedule:
-#  discoverall:
-#    when: '5 7 * * *'
-#  macwalk:
-#    when:
-#      min: 20
-#  arpwalk:
-#    when:
-#      min: 50
-#  nbtwalk:
-#    when: '0 8,13,21 * * *'
-#  expire:
-#    when: '20 23 * * *'
+schedule:
+  discoverall:
+    when: '5 7 * * *'
+  macwalk:
+    when:
+      min: 20
+  arpwalk:
+    when:
+      min: 50
+  nbtwalk:
+    when: '0 8,13,21 * * *'
+  expire:
+    when: '30 23 * * *'
 
 job_prio:
   high:
diff --git a/share/environments/deployment.yml b/share/environments/deployment.yml
index aa126c3d..e0c0ed3f 100644
--- a/share/environments/deployment.yml
+++ b/share/environments/deployment.yml
@@ -18,11 +18,6 @@ database:
 # RECOMMENDED SETTINGS
 # --------------------
 
-# set to false if you MUST maintain backwards compatibility
-# with Netdisco 1.x web frontend.
-# `````````````````````````````````````````````````````````
-safe_password_store: true
-
 # will be stripped from fqdn when displayed in the web UI
 # also, do not forget the leading dot.
 # ```````````````````````````````````````````````````````
@@ -40,6 +35,15 @@ device_auth:
 #    read: false
 #    write: true
 
+
+# ¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸
+# ¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸
+
+
+# ---------------------------------------------------------------
+# OTHER INTERESTING SETTINGS WHERE THE DEFAULTS ARE PROBABLY OKAY
+# ---------------------------------------------------------------
+
 # this is the schedule for automatically keeping netdisco up-to-date
 # ``````````````````````````````````````````````````````````````````
 #schedule:
@@ -54,15 +58,15 @@ device_auth:
 #  nbtwalk:
 #    when: '0 8,13,21 * * *'
 #  expire:
-#    when: '20 23 * * *'
+#    when: '30 23 * * *'
 
 # do not discover IP Phones or Wireless Access Points.
 # usually these are visible as device neighbors but don't support
 # SNMP, which just clogs up the job queue.
 # ```````````````````````````````````````````````````````````````
-discover_no_type:
-  - '(?i)phone'
-  - '(?i)(?:wap|wireless)'
+#discover_no_type:
+#  - '(?i)phone'
+#  - '(?i)(?:wap|wireless)'
 
 # number of SNMP workers to run in parallel (in netdisco-backend).
 # the default is twice the number of CPU cores. increase this if
@@ -81,3 +85,8 @@ discover_no_type:
 # `````````````````````````````````````````````````````````````````````
 #no_auth: false
 
+# set to false if you MUST maintain backwards compatibility
+# with Netdisco 1.x web frontend.
+# `````````````````````````````````````````````````````````
+#safe_password_store: true
+