--- htdocs/html_mod_python.py 2018-04-23 15:47:51.000000000 +0200
+++ htdocs/html_mod_python.py.patched 2018-05-14 23:27:41.263966762 +0200
@@ -297,10 +297,10 @@
def css_filename_for_browser(self, css):
- rel_path = "/share/check_mk/web/htdocs/" + css + ".css"
+ rel_path = "/usr/share/check_mk/web/htdocs/" + css + ".css"
if os.path.exists(cmk.paths.omd_root + rel_path) or \
os.path.exists(cmk.paths.omd_root + "/local" + rel_path):
- return '%s-%s.css' % (css, cmk.__version__)
+ return '%s.css' % (css)
# Make the browser load specified javascript files. We have some special handling here:
@@ -309,7 +309,7 @@
# c) load the minified javascript when not in debug mode
def javascript_filename_for_browser(self, jsname):
filename_for_browser = None
- rel_path = "/share/check_mk/web/htdocs/js"
+ rel_path = "/usr/share/check_mk/web/htdocs/js"
if self.enable_debug:
min_parts = [ "", "_min" ]
else:
@@ -318,7 +318,7 @@
for min_part in min_parts:
path_pattern = cmk.paths.omd_root + "%s" + rel_path + "/" + jsname + min_part + ".js"
if os.path.exists(path_pattern % "") or os.path.exists(path_pattern % "/local"):
- filename_for_browser = 'js/%s%s-%s.js' % (jsname, min_part, cmk.__version__)
+ filename_for_browser = 'js/%s%s.js' % (jsname, min_part)
break
return filename_for_browser
@@ -329,7 +329,7 @@
# or images/icons/*.png. When an icon is available as internal icon,
# always use this one
is_internal = False
- rel_path = "share/check_mk/web/htdocs/images/icon_"+icon_name+".png"
+ rel_path = "/usr/share/check_mk/web/htdocs/images/icon_"+icon_name+".png"
if os.path.exists(cmk.paths.omd_root+"/"+rel_path):
is_internal = True
elif os.path.exists(cmk.paths.omd_root+"/local/"+rel_path):
--- cmk/paths.py 2018-04-23 15:47:51.000000000 +0200
+++ cmk/paths.py.patched 2018-05-14 23:29:43.709065567 +0200
@@ -112,34 +112,34 @@
globals().update({
"omd_root" : omd_root,
- "default_config_dir" : os.path.join(omd_root, "etc/check_mk"),
- "main_config_file" : os.path.join(omd_root, "etc/check_mk/main.mk"),
- "final_config_file" : os.path.join(omd_root, "etc/check_mk/final.mk"),
- "local_config_file" : os.path.join(omd_root, "etc/check_mk/local.mk"),
- "check_mk_config_dir" : os.path.join(omd_root, "etc/check_mk/conf.d"),
- "modules_dir" : os.path.join(omd_root, "share/check_mk/modules"),
- "var_dir" : os.path.join(omd_root, "var/check_mk"),
- "log_dir" : os.path.join(omd_root, "var/log"),
- "autochecks_dir" : os.path.join(omd_root, "var/check_mk/autochecks"),
- "precompiled_hostchecks_dir" : os.path.join(omd_root, "var/check_mk/precompiled"),
- "snmpwalks_dir" : os.path.join(omd_root, "var/check_mk/snmpwalks"),
- "counters_dir" : os.path.join(omd_root, "tmp/check_mk/counters"),
- "tcp_cache_dir" : os.path.join(omd_root, "tmp/check_mk/cache"),
- "tmp_dir" : os.path.join(omd_root, "tmp/check_mk"),
- "logwatch_dir" : os.path.join(omd_root, "var/check_mk/logwatch"),
- "nagios_startscript" : os.path.join(omd_root, "etc/init.d/core"),
+ "default_config_dir" : os.path.join(omd_root, "/etc/check_mk"),
+ "main_config_file" : os.path.join(omd_root, "/etc/check_mk/main.mk"),
+ "final_config_file" : os.path.join(omd_root, "/etc/check_mk/final.mk"),
+ "local_config_file" : os.path.join(omd_root, "/etc/check_mk/local.mk"),
+ "check_mk_config_dir" : os.path.join(omd_root, "/etc/check_mk/conf.d"),
+ "modules_dir" : os.path.join(omd_root, "/usr/share/check_mk/modules"),
+ "var_dir" : os.path.join(omd_root, "/var/lib/check_mk"),
+ "log_dir" : os.path.join(omd_root, "/var/lib/check_mk/log"),
+ "autochecks_dir" : os.path.join(omd_root, "/var/lib/check_mk/autochecks"),
+ "precompiled_hostchecks_dir" : os.path.join(omd_root, "/var/lib/check_mk/precompiled"),
+ "snmpwalks_dir" : os.path.join(omd_root, "/var/lib/check_mk/snmpwalks"),
+ "counters_dir" : os.path.join(omd_root, "/var/lib/check_mk/counters"),
+ "tcp_cache_dir" : os.path.join(omd_root, "/var/lib/check_mk/cache"),
+ "tmp_dir" : os.path.join(omd_root, "/var/lib/check_mk/tmp"),
+ "logwatch_dir" : os.path.join(omd_root, "/var/lib/check_mk/logwatch"),
+ "nagios_startscript" : os.path.join(omd_root, "/etc/init.d/nagios"),
# Switched via symlinks on icinga/nagios change
- "nagios_conf_dir" : os.path.join(omd_root, "etc/nagios/conf.d"),
- "nagios_objects_file" : os.path.join(omd_root, "etc/nagios/conf.d/check_mk_objects.cfg"),
- "check_result_path" : os.path.join(omd_root, "tmp/nagios/checkresults"),
- "nagios_status_file" : os.path.join(omd_root, "tmp/nagios/status.dat"),
-
- "apache_config_dir" : os.path.join(omd_root, "etc/apache"),
- "htpasswd_file" : os.path.join(omd_root, "etc/htpasswd"),
- "livestatus_unix_socket" : os.path.join(omd_root, "tmp/run/live"),
- "pnp_rraconf_dir" : os.path.join(omd_root, "share/check_mk/pnp-rraconf"),
- "livebackendsdir" : os.path.join(omd_root, "share/check_mk/livestatus"),
+ "nagios_conf_dir" : os.path.join(omd_root, "/etc/nagios/conf.d"),
+ "nagios_objects_file" : os.path.join(omd_root, "/etc/nagios/conf.d/check_mk_objects.cfg"),
+ "check_result_path" : os.path.join(omd_root, "/var/log/nagios/spool/checkresults"),
+ "nagios_status_file" : os.path.join(omd_root, "/var/log/nagios/status.dat"),
+
+ "apache_config_dir" : os.path.join(omd_root, "/etc/httpd/conf.d"),
+ "htpasswd_file" : os.path.join(omd_root, "/etc/nagios/htpasswd.users"),
+ "livestatus_unix_socket" : os.path.join(omd_root, "/var/log/nagios/rw/live"),
+ "pnp_rraconf_dir" : os.path.join(omd_root, "/usr/share/check_mk/pnp-rraconf"),
+ "livebackendsdir" : os.path.join(omd_root, "/usr/share/check_mk/livestatus"),
})
_set_core_specific_paths()
@@ -161,15 +161,15 @@
if core == "icinga":
globals().update({
- "nagios_binary" : os.path.join(omd_root, "bin/icinga"),
- "nagios_config_file" : os.path.join(omd_root, "tmp/icinga/icinga.cfg"),
- "nagios_command_pipe_path" : os.path.join(omd_root, "tmp/run/icinga.cmd"),
+ "nagios_binary" : os.path.join(omd_root, "/usr/bin/icinga"),
+ "nagios_config_file" : os.path.join(omd_root, "/etc/icinga/icinga.cfg"),
+ "nagios_command_pipe_path" : os.path.join(omd_root, "/var/run/icinga.cmd"),
})
else:
globals().update({
- "nagios_binary" : os.path.join(omd_root, "bin/nagios"),
- "nagios_config_file" : os.path.join(omd_root, "tmp/nagios/nagios.cfg"),
- "nagios_command_pipe_path" : os.path.join(omd_root, "tmp/run/nagios.cmd"),
+ "nagios_binary" : os.path.join(omd_root, "/usr/sbin/nagios"),
+ "nagios_config_file" : os.path.join(omd_root, "/etc/nagios/nagios.cfg"),
+ "nagios_command_pipe_path" : os.path.join(omd_root, "/var/log/nagios/rw/nagios.cmd"),
})
@@ -191,24 +191,24 @@
def _set_overridable_paths(local=False):
- rel_base = "local" if local else ""
+ rel_base = ""
var_prefix = "local_" if local else ""
globals().update({
- var_prefix+"share_dir" : os.path.join(omd_root, rel_base, "share/check_mk"),
- var_prefix+"checks_dir" : os.path.join(omd_root, rel_base, "share/check_mk/checks"),
- var_prefix+"notifications_dir" : os.path.join(omd_root, rel_base, "share/check_mk/notifications"),
- var_prefix+"inventory_dir" : os.path.join(omd_root, rel_base, "share/check_mk/inventory"),
- var_prefix+"check_manpages_dir" : os.path.join(omd_root, rel_base, "share/check_mk/checkman"),
- var_prefix+"agents_dir" : os.path.join(omd_root, rel_base, "share/check_mk/agents"),
- var_prefix+"mibs_dir" : os.path.join(omd_root, rel_base, "share/check_mk/mibs"),
- var_prefix+"web_dir" : os.path.join(omd_root, rel_base, "share/check_mk/web"),
- var_prefix+"pnp_templates_dir" : os.path.join(omd_root, rel_base, "share/check_mk/pnp-templates"),
- var_prefix+"doc_dir" : os.path.join(omd_root, rel_base, "share/doc/check_mk"),
- var_prefix+"locale_dir" : os.path.join(omd_root, rel_base, "share/check_mk/locale"),
- var_prefix+"bin_dir" : os.path.join(omd_root, rel_base, "bin"),
- var_prefix+"lib_dir" : os.path.join(omd_root, rel_base, "lib"),
- var_prefix+"mib_dir" : os.path.join(omd_root, rel_base, "share/snmp/mibs"),
+ var_prefix+"share_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk"),
+ var_prefix+"checks_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/checks"),
+ var_prefix+"notifications_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/notifications"),
+ var_prefix+"inventory_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/inventory"),
+ var_prefix+"check_manpages_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/checkman"),
+ var_prefix+"agents_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/agents"),
+ var_prefix+"mibs_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/mibs"),
+ var_prefix+"web_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/web"),
+ var_prefix+"pnp_templates_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/pnp-templates"),
+ var_prefix+"doc_dir" : os.path.join(omd_root, rel_base, "/usr/share/doc/check_mk"),
+ var_prefix+"locale_dir" : os.path.join(omd_root, rel_base, "/usr/share/check_mk/locale"),
+ var_prefix+"bin_dir" : os.path.join(omd_root, rel_base, "/usr/bin"),
+ var_prefix+"lib_dir" : os.path.join(omd_root, rel_base, "/usr/lib64"),
+ var_prefix+"mib_dir" : os.path.join(omd_root, rel_base, "/usr/share/snmp/mibs"),
})