135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into og-newnetmap

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-17 19:52:49 +00:00
parent 6962258223 c8806beaca
commit 39ca1491b0
11 changed files with 105 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/config.yml
View File

@@ -131,6 +131,7 @@ sidebar_defaults:
age_num: { default: 3 }
age_unit: { default: months }
mac_format: { default: IEEE }
neigh_id: { default: null }
report_moduleinventory:
fruonly: {default: checked }
matchall: {default: checked }

10
share/environments/deployment.yml
View File

@@ -18,11 +18,6 @@ database:
# RECOMMENDED SETTINGS
# --------------------
# will be stripped from fqdn when displayed in the web UI
# also, do not forget the leading dot.
# ```````````````````````````````````````````````````````
#domain_suffix: '.example.com'
# SNMP community string(s)
# ````````````````````````
device_auth:
@@ -35,6 +30,11 @@ device_auth:
# read: false
# write: true
# will be stripped from fqdn when displayed in the web UI
# also, do not forget the leading dot.
# ```````````````````````````````````````````````````````
#domain_suffix: '.example.com'
# ¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸
# ¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸.·´¯`·.¸¸