Module: check_mk
Branch: master
Commit: 0cc98469ef90c884fe8ecb1869a821647260a8af
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cc98469ef90c8…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Feb 16 16:42:15 2015 +0100
New config variable crash_report_target for target email of crash reports
---
web/htdocs/crashed_check.py | 4 ++--
web/htdocs/htmllib.py | 2 +-
web/plugins/config/builtin.py | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/web/htdocs/crashed_check.py b/web/htdocs/crashed_check.py
index f3bf423..76ddcd4 100644
--- a/web/htdocs/crashed_check.py
+++ b/web/htdocs/crashed_check.py
@@ -26,7 +26,7 @@
import subprocess
from lib import *
-import table, defaults
+import table, defaults, config
def fetch_file_from_tar(tardata, filename):
p = subprocess.Popen(['tar', 'xzf', '-',
'--to-stdout', filename], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
@@ -86,7 +86,7 @@ def page_crashed_check():
html.begin_context_buttons()
mailto_url = html.makeuri([("subject", "Check_MK Crash Report - "
+ defaults.check_mk_version),
- ("body", body)],
filename="mailto:feedback@check-mk.org")
+ ("body", body)], filename="mailto:" +
config.crash_report_target)
html.context_button(_("Submit Report"), mailto_url, "email")
html.end_context_buttons()
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index 689519d..12f9bc8 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -966,7 +966,7 @@ class html:
self.begin_context_buttons()
mailto_url = self.makeuri_contextless([
("subject", "Check_MK GUI Crash Report - " +
defaults.check_mk_version),
- ("body", mail_body)],
filename="mailto:feedback@check-mk.org")
+ ("body", mail_body)], filename="mailto:" +
config.crash_report_target)
self.context_button(_("Submit Report"), mailto_url, "email")
self.end_context_buttons()
diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py
index 11f4b2a..01cb9f2 100644
--- a/web/plugins/config/builtin.py
+++ b/web/plugins/config/builtin.py
@@ -210,6 +210,10 @@ escape_plugin_output = True
# Virtual host trees for the "Virtual Host Trees" snapin
virtual_host_trees = []
+# Target email address for "Crashed Check" page
+crash_report_target = "feedback(a)check-mk.org"
+
+
# _ _ ____ ____
# | | | |___ ___ _ __| _ \| __ )
# | | | / __|/ _ \ '__| | | | _ \