From c968f2ec967d0c4017540f54533d1303e98041c1 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 24 Aug 2013 15:44:20 +0100 Subject: [PATCH] suggest default housekeeping --- .../lib/App/Netdisco/Manual/Configuration.pod | 8 +++- Netdisco/share/config.yml | 37 ++++++++++++------- Netdisco/share/environments/deployment.yml | 12 +++++- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod index b36d7cbd..858e9882 100644 --- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod +++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod @@ -425,7 +425,7 @@ Value: Settings Tree. Default: workers: interactives: 2 - pollers: 2 + pollers: 5 sleep_time: 2 Control the activity of the backend daemon with this configuration setting. @@ -540,6 +540,12 @@ Value: String. Default: C. Don't touch this. +=head3 C + +Value: Boolean. Default: C. + +There's no need to touch this. See deployment documentation for how to proxy. + =head1 UNSUPPORTED (SO FAR) These settings are from Netdisco 1.x but are yet to be supported in Netdisco diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml index b18071d5..78fc4f84 100644 --- a/Netdisco/share/config.yml +++ b/Netdisco/share/config.yml @@ -10,7 +10,6 @@ # ---------------- log: 'warning' -logger: 'console' logger_format: '[%P] %L @%D> %m' # ------------ @@ -19,8 +18,19 @@ logger_format: '[%P] %L @%D> %m' domain_suffix: '' no_auth: false +suggest_guest: false +trust_remote_user: false +trust_x_remote_user: false +#ldap: +# servers: [] +# user_string: 'MYDOMAIN\%USER%' +# base: '' +# proxy_user: '' +# proxy_pass: '' +# opts: +# debug: 3 +# tls_opts: {} path: '/' -behind_proxy: false web_plugins: - Inventory - Report::PortUtilization @@ -40,15 +50,6 @@ web_plugins: - Device::Addresses web_plugins_extra: [] -# authN and authZ controls from the database -plugins: - Auth::Extensible: - no_default_pages: true - realms: - users: - provider: 'App::Netdisco::Web::Auth::Provider::DBIC' - schema_name: 'netdisco' - # ------------- # NETDISCO CORE # ------------- @@ -97,7 +98,7 @@ no_port_control: false workers: interactives: 2 - pollers: 2 + pollers: 5 sleep_time: 2 #housekeeping: @@ -108,7 +109,9 @@ workers: # min: 30 # macwalk: # when: +# min: 15 # hour: '*/2' +# wday: 'mon-fri' # --------------- # DANCER INTERNAL @@ -117,6 +120,7 @@ workers: charset: 'UTF-8' warnings: false show_errors: false +logger: 'console' engines: template_toolkit: encoding: 'utf8' @@ -124,8 +128,15 @@ engines: end_tag: '%]' PRE_CHOMP: 1 layout: 'main' +plugins: + Auth::Extensible: + no_default_pages: true + realms: + users: + provider: 'App::Netdisco::Web::Auth::Provider::DBIC' + schema_name: 'netdisco' session: 'YAML' template: 'template_toolkit' route_cache: true appname: 'Netdisco' - +behind_proxy: false diff --git a/Netdisco/share/environments/deployment.yml b/Netdisco/share/environments/deployment.yml index 5ef920bf..0409198c 100644 --- a/Netdisco/share/environments/deployment.yml +++ b/Netdisco/share/environments/deployment.yml @@ -28,9 +28,19 @@ database: # community: ['public'] # community_rw: ['private'] -# if unset, Netdisco loads all MIBs in mibhome directory. +# when not set, Netdisco loads all MIBs in mibhome directory. # mibdirs: # - cisco # - rfc # - net-snmp +# housekeeping: +# discoverall: +# when: '5 7 * * *' +# macwalk: +# when: +# min: 20 +# arpwalk: +# when: +# min: 50 +