[check-mk] In addition to a customized 'defaults' file, add a defaults.py accordingly. (BZ: #987859)
averi
averi at fedoraproject.org
Thu Aug 29 16:24:21 UTC 2013
commit df6399da841cead3020d89565642d99762f3f0ac
Author: Andrea Veri <av at gnome.org>
Date: Thu Aug 29 18:23:16 2013 +0200
In addition to a customized 'defaults' file, add a defaults.py accordingly. (BZ: #987859)
check-mk.spec | 6 ++++++
defaults.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 0 deletions(-)
---
diff --git a/check-mk.spec b/check-mk.spec
index 930445f..ceb4ec8 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -14,6 +14,7 @@ Requires: mod_python
%endif
Source1: First-Installation.txt
Source2: defaults
+Source3: defaults.py
AutoReq: 0
Patch0: fix-agents-conf-directories.patch
@@ -159,6 +160,10 @@ sed -i 's|/usr/lib/nagios/plugins|%{_libdir}/nagios/plugins|' \
rm -rf %{buildroot}%{_datadir}/check_mk/modules/defaults
install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/check_mk/modules/
+# Do the same for defaults.py
+rm -rf %{buildroot}%{_datadir}/check_mk/web/htdocs/defaults.py
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/check_mk/web/htdocs/
+
# Remove other operating systems agents, we definitely don't need them on this package.
rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.aix
rm -rf %{buildroot}%{_datadir}/check_mk/agents/check_mk_agent.freebsd
@@ -241,6 +246,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
- Requires set to mod_python on RHEL, no mod_wsgi migration yet on EPEL. (BZ: #987852)
- Add a fix-agents-conf-directories.patch that actually fixes the configuration
files path of '/usr/bin/check_mk_agent'. Thanks 'Brainslug' for the patch. (BZ: #989793)
+- In addition to a customized 'defaults' file, add a defaults.py accordingly. (BZ: #987859)
* Fri Aug 02 2013 Petr Pisar <ppisar at redhat.com> - 1.2.2-5
- Do not provide from a documentation
diff --git a/defaults.py b/defaults.py
new file mode 100644
index 0000000..796fb72
--- /dev/null
+++ b/defaults.py
@@ -0,0 +1,50 @@
+# This file has been created during setup of check_mk at Tue Apr 9 17:15:45 CEST 2013.
+# Do not edit this file. Also do not try to override these settings
+# in main.mk since some of them are hardcoded into several files
+# during setup.
+#
+# If you need to change these settings, you have to re-run setup.sh
+# and enter new values when asked, or edit ~/.check_mk_setup.conf and
+# run ./setup.sh --yes.
+
+check_mk_version = '1.2.2'
+default_config_dir = '/etc/check_mk'
+check_mk_configdir = '/etc/check_mk/conf.d'
+share_dir = '/usr/share/check_mk'
+checks_dir = '/usr/share/check_mk/checks'
+notifications_dir = '/usr/share/check_mk/notifications'
+check_manpages_dir = '/usr/share/doc/check_mk/checks'
+modules_dir = '/usr/share/check_mk/modules'
+locale_dir = '/usr/share/check_mk/locale'
+agents_dir = '/usr/share/check_mk/agents'
+var_dir = '/var/lib/check_mk'
+lib_dir = '/usr/lib/check_mk'
+snmpwalks_dir = '/var/lib/check_mk/snmpwalks'
+autochecksdir = '/var/lib/check_mk/autochecks'
+precompiled_hostchecks_dir = '/var/lib/check_mk/precompiled'
+counters_directory = '/var/lib/check_mk/counters'
+tcp_cache_dir = '/var/lib/check_mk/cache'
+tmp_dir = '/var/lib/check_mk/tmp'
+logwatch_dir = '/var/lib/check_mk/logwatch'
+nagios_objects_file = '/etc/nagios/conf.d/check_mk_objects.cfg'
+nagios_command_pipe_path = '/var/log/nagios/rw/nagios.cmd'
+check_result_path = '/var/log/nagios/spool/checkresults'
+nagios_status_file = '/var/log/nagios/status.dat'
+nagios_conf_dir = '/etc/nagios/objects'
+nagios_user = 'nagios'
+logwatch_notes_url = '/check_mk/logwatch.py?host=%s&file=%s'
+www_group = 'nagios'
+nagios_config_file = '/etc/nagios/nagios.cfg'
+nagios_startscript = '/etc/init.d/nagios'
+nagios_binary = '/usr/sbin/nagios'
+apache_config_dir = '/etc/httpd/conf.d'
+htpasswd_file = '/etc/nagios/htpasswd.users'
+nagios_auth_name = 'Nagios Access'
+web_dir = '/usr/share/check_mk/web'
+livestatus_unix_socket = '/var/log/nagios/rw/live'
+livebackendsdir = '/usr/share/check_mk/livestatus'
+url_prefix = '/'
+pnp_url = '/pnp4nagios/'
+pnp_templates_dir = '/usr/share/check_mk/pnp-templates'
+doc_dir = '/usr/share/doc/check_mk'
+check_mk_automation = 'sudo -u mockbuild /usr/bin/check_mk --automation'
More information about the scm-commits
mailing list