Skip to content
Snippets Groups Projects
Commit 711539b4 authored by Rajmund Hruška's avatar Rajmund Hruška
Browse files

Merge branch 'devel' into release

parents 1916cf37 38eb4086
No related branches found
Tags v2.9.0
No related merge requests found
Showing
with 122 additions and 15 deletions
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
# #
# Run once in every 2 minutes. # Run once in every 2 minutes.
*/2 * * * * mentat /usr/local/bin/mentat-ideagen.py --random-count 20 */2 * * * * mentat /var/mentat/venv/bin/mentat-ideagen.py --random-count 20
...@@ -174,8 +174,8 @@ ...@@ -174,8 +174,8 @@
#"pstate_dump": false, #"pstate_dump": false,
#"pstate_log": false, #"pstate_log": false,
#"action": null, #"action": null,
#"user": "mentat", "user": "mentat",
#"group": "mentat", "group": "mentat",
# This is a dummy last configuration so that the user does not have to fix # This is a dummy last configuration so that the user does not have to fix
# the commas in the whole configuration file after each change. # the commas in the whole configuration file after each change.
......
# Force the debug mode.
DEBUG = True
# Debug template file loading precedence.
#EXPLAIN_TEMPLATE_LOADING = True
# Enable profiler on debug toolbar. DEBUG must be 'True' for toolbar to be visible.
#DEBUG_TB_PROFILER_ENABLED = True
# Move the application from webserver root to different location.
#APPLICATION_ROOT = '/mentat'
# Setup local secret key to be used as cryptographic salt.
SECRET_KEY = '!!!-CHANGE-ME-ASAP-!!!-local-secret-key'
# Define list of Hawat administrator accounts.
#EMAIL_ADMINS = ['boss@domain.org', 'admin@domain.org']
# Define list of Hawat administrator accounts, that receive feedback messages for reports.
#HAWAT_REPORT_FEEDBACK_MAILS = ['admin@domain.org']
# Directories with translations used in Hawat.
BABEL_DEFAULT_LOCALE = 'en'
BABEL_DEFAULT_TIMEZONE = 'UTC'
#BABEL_DEFAULT_LOCALE = 'cs'
#BABEL_DEFAULT_TIMEZONE = 'Europe/Prague'
# Limit for number of objects for which to automatically fetch additional data services.
HAWAT_LIMIT_AODS = 20
# Event database search query quota.
HAWAT_SEARCH_QUERY_QUOTA = 7
MAIL_SERVER = 'localhost'
MAIL_PORT = 1025
MAIL_DEFAULT_SENDER = 'mentat@cesnet.cz'
HAWAT_LOG_DEFAULT_LEVEL = 'debug'
HAWAT_LOG_FILE = '/var/tmp/mentat-hawat.py.log'
HAWAT_LOG_FILE_LEVEL = 'debug'
ENABLED_BLUEPRINTS = [
'vial.blueprints.auth',
'vial.blueprints.auth_api',
'vial.blueprints.design_bs3',
'vial.blueprints.devtools',
'vial.blueprints.changelogs',
'hawat.blueprints.auth_env',
'hawat.blueprints.auth_dev',
'hawat.blueprints.auth_pwd',
'hawat.blueprints.home',
'hawat.blueprints.reports',
'hawat.blueprints.events',
'hawat.blueprints.hosts',
'hawat.blueprints.timeline',
'hawat.blueprints.dnsr',
#'hawat.blueprints.pdnsr',
'hawat.blueprints.geoip',
#'hawat.blueprints.nerd',
'hawat.blueprints.whois',
'hawat.blueprints.performance',
'hawat.blueprints.status',
'hawat.blueprints.dbstatus',
'hawat.blueprints.users',
'hawat.blueprints.groups',
'hawat.blueprints.settings_reporting',
'hawat.blueprints.filters',
'hawat.blueprints.networks',
]
...@@ -20,10 +20,10 @@ SECRET_KEY = '!!!-CHANGE-ME-ASAP-!!!-local-secret-key' ...@@ -20,10 +20,10 @@ SECRET_KEY = '!!!-CHANGE-ME-ASAP-!!!-local-secret-key'
#HAWAT_REPORT_FEEDBACK_MAILS = ['admin@domain.org'] #HAWAT_REPORT_FEEDBACK_MAILS = ['admin@domain.org']
# Directories with translations used in Hawat. # Directories with translations used in Hawat.
BABEL_DEFAULT_LOCALE = 'en' BABEL_DEFAULT_LOCALE = 'en'
BABEL_DEFAULT_TIMEZONE = 'UTC' BABEL_DEFAULT_TIMEZONE = 'UTC'
#BABEL_DEFAULT_LOCALE = 'cs' #BABEL_DEFAULT_LOCALE = 'cs'
#BABEL_DEFAULT_TIMEZONE = 'Europe/Prague' #BABEL_DEFAULT_TIMEZONE = 'Europe/Prague'
# Limit for number of objects for which to automatically fetch additional data services. # Limit for number of objects for which to automatically fetch additional data services.
HAWAT_LIMIT_AODS = 20 HAWAT_LIMIT_AODS = 20
......
...@@ -98,6 +98,24 @@ ...@@ -98,6 +98,24 @@
# #
#"mail_test_mode": false, #"mail_test_mode": false,
# Send emails in development mode (flag). Will use localhost:1025 as mail server.
# default: false (set in core/common.json.conf)
# type: bool
#
#"mail_dev_mode": true,
# Hostname for development SMTP server.
# default: "localhost" (set in core/common.json.conf)
# type: string
#
#"mail_dev_server": "localhost",
# Port for development SMTP server.
# default: 1025 (set in core/common.json.conf)
# type: integer
#
#"mail_dev_port": 1025,
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Common script configurations # Common script configurations
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
......
...@@ -150,8 +150,8 @@ ...@@ -150,8 +150,8 @@
#"pstate_dump": false, #"pstate_dump": false,
#"pstate_log": false, #"pstate_log": false,
#"action": null, #"action": null,
#"user": "mentat", "user": "mentat",
#"group": "mentat", "group": "mentat",
# This is a dummy last configuration so that the user does not have to fix # This is a dummy last configuration so that the user does not have to fix
# the commas in the whole configuration file after each change. # the commas in the whole configuration file after each change.
......
...@@ -372,8 +372,8 @@ ...@@ -372,8 +372,8 @@
#"pstate_dump": false, #"pstate_dump": false,
#"pstate_log": false, #"pstate_log": false,
#"action": null, #"action": null,
#"user": "mentat", "user": "mentat",
#"group": "mentat", "group": "mentat",
# This is a dummy last configuration so that the user does not have to fix # This is a dummy last configuration so that the user does not have to fix
# the commas in the whole configuration file after each change. # the commas in the whole configuration file after each change.
......
...@@ -132,6 +132,24 @@ ...@@ -132,6 +132,24 @@
# #
#"mail_test_mode": false, #"mail_test_mode": false,
# Send emails in development mode (flag). Will use localhost:1025 as mail server.
# default: false (set in core/common.json.conf)
# type: bool
#
#"mail_dev_mode": true,
# Hostname for development SMTP server.
# default: "localhost" (set in core/common.json.conf)
# type: string
#
#"mail_dev_server": "localhost",
# Port for development SMTP server.
# default: 1025 (set in core/common.json.conf)
# type: integer
#
#"mail_dev_port": 1025,
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Common script configurations # Common script configurations
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
......
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
#"pstate_dump": false, #"pstate_dump": false,
#"pstate_log": false, #"pstate_log": false,
#"action": null, #"action": null,
#"user": "mentat", "user": "mentat",
#"group": "mentat", "group": "mentat",
# This is a dummy last configuration so that the user does not have to fix # This is a dummy last configuration so that the user does not have to fix
# the commas in the whole configuration file after each change. # the commas in the whole configuration file after each change.
......
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
#"pstate_dump": false, #"pstate_dump": false,
#"pstate_log": false, #"pstate_log": false,
#"action": null, #"action": null,
#"user": "mentat", "user": "mentat",
#"group": "mentat", "group": "mentat",
# This is a dummy last configuration so that the user does not have to fix # This is a dummy last configuration so that the user does not have to fix
# the commas in the whole configuration file after each change. # the commas in the whole configuration file after each change.
......
File moved
File moved
File moved
...@@ -4,5 +4,6 @@ nose==1.3.7 ...@@ -4,5 +4,6 @@ nose==1.3.7
coverage==5.0.4 coverage==5.0.4
pyflakes==2.1.1 pyflakes==2.1.1
pylint==2.4.4 pylint==2.4.4
sendria==2.2.2
sphinx==2.4.4 sphinx==2.4.4
sphinx-rtd-theme==0.4.3 sphinx-rtd-theme==0.4.3
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment