You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/02/10 16:00:07 UTC
git commit: AMBARI-4572. Nagios Server install fails on
Suse.(vbrodetskyi)
Updated Branches:
refs/heads/trunk 8a9d841ee -> 1fd3e2ccb
AMBARI-4572. Nagios Server install fails on Suse.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1fd3e2cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1fd3e2cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1fd3e2cc
Branch: refs/heads/trunk
Commit: 1fd3e2ccbd1731f686db28db18438c87c889645d
Parents: 8a9d841
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Mon Feb 10 16:58:45 2014 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Mon Feb 10 16:58:45 2014 +0200
----------------------------------------------------------------------
.../stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py | 3 ++-
.../stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1fd3e2cc/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
index 549aab6..342b3bc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
@@ -33,7 +33,6 @@ nagios_rw_dir = "/var/nagios/rw"
plugins_dir = "/usr/lib64/nagios/plugins"
nagios_obj_dir = "/etc/nagios/objects"
check_result_path = "/var/nagios/spool/checkresults"
-nagios_httpd_config_file = format("/etc/httpd/conf.d/nagios.conf")
nagios_log_dir = "/var/log/nagios"
nagios_log_archives_dir = format("{nagios_log_dir}/archives")
nagios_host_cfg = format("{nagios_obj_dir}/hadoop-hosts.cfg")
@@ -106,9 +105,11 @@ all_ping_ports = config['clusterHostInfo']['all_ping_ports']
if System.get_instance().os_family == "suse":
nagios_p1_pl = "/usr/lib/nagios/p1.pl"
htpasswd_cmd = "htpasswd2"
+ nagios_httpd_config_file = format("/etc/apache2/conf.d/nagios.conf")
else:
nagios_p1_pl = "/usr/bin/p1.pl"
htpasswd_cmd = "htpasswd"
+ nagios_httpd_config_file = format("/etc/httpd/conf.d/nagios.conf")
nagios_user = config['configurations']['global']['nagios_user']
nagios_group = config['configurations']['global']['nagios_group']
http://git-wip-us.apache.org/repos/asf/ambari/blob/1fd3e2cc/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
index 051465c..8754930 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
@@ -33,7 +33,6 @@ nagios_rw_dir = "/var/nagios/rw"
plugins_dir = "/usr/lib64/nagios/plugins"
nagios_obj_dir = "/etc/nagios/objects"
check_result_path = "/var/nagios/spool/checkresults"
-nagios_httpd_config_file = format("/etc/httpd/conf.d/nagios.conf")
nagios_log_dir = "/var/log/nagios"
nagios_log_archives_dir = format("{nagios_log_dir}/archives")
nagios_host_cfg = format("{nagios_obj_dir}/hadoop-hosts.cfg")
@@ -100,9 +99,11 @@ all_ping_ports = config['clusterHostInfo']['all_ping_ports']
if System.get_instance().os_family == "suse":
nagios_p1_pl = "/usr/lib/nagios/p1.pl"
htpasswd_cmd = "htpasswd2"
+ nagios_httpd_config_file = format("/etc/apache2/conf.d/nagios.conf")
else:
nagios_p1_pl = "/usr/bin/p1.pl"
htpasswd_cmd = "htpasswd"
+ nagios_httpd_config_file = format("/etc/httpd/conf.d/nagios.conf")
nagios_user = config['configurations']['global']['nagios_user']
nagios_group = config['configurations']['global']['nagios_group']