From 27baa7fde48c1c6b825fbc33a5103d6b13a55162 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Fri, 12 Jun 2009 16:22:49 +0000 Subject: [PATCH] use 'pattern' argument to site and node pages. add a link to ssl to allow the racadm binary to work. add c++ compat library for racadm binary --- Monitor.spec | 7 +++++-- web/MonitorWeb/monitorweb/templates/links.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Monitor.spec b/Monitor.spec index 45a791e..2cc6b16 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -56,6 +56,7 @@ Requires: python-setuptools-devel Requires: python-peak-util-extremes Requires: TurboGears +Requires: compat-libstdc++-296 Requires: openssh-clients Requires: perl-libwww-perl Requires: perl-IO-Socket-SSL @@ -64,8 +65,7 @@ Requires: nmap Requires: rt3 Requires: plewww-plekit -#Requires: python-sqlalchemy -#Requires: python-elixir + #Requires: zabbix-client #Requires: zabbix-gui #Requires: zabbix-server @@ -218,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT #easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz #easy_install --build-directory /var/tmp -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg +# crazy openssl libs for racadm binary +ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2 + if grep 'pam_loginuid.so' /etc/pam.d/crond ; then sed -i -e 's/^session required pam_loginuid.so/#session required pam_loginuid.so/g' /etc/pam.d/crond fi diff --git a/web/MonitorWeb/monitorweb/templates/links.py b/web/MonitorWeb/monitorweb/templates/links.py index e07d8f1..95f192e 100644 --- a/web/MonitorWeb/monitorweb/templates/links.py +++ b/web/MonitorWeb/monitorweb/templates/links.py @@ -5,11 +5,11 @@ import urllib def plc_mail_uri(ticketid): return config.RT_WEB_SERVER + "/Ticket/Display.html?id=" + str(ticketid) def plc_node_uri(hostname): - return "https://" + config.PLC_WWW_HOSTNAME + "/db/nodes/index.php?nodepattern=" + str(hostname) + return "https://" + config.PLC_WWW_HOSTNAME + "/db/nodes/index.php?pattern=" + str(hostname) def plc_node_uri_id(node_id): return "https://" + config.PLC_WWW_HOSTNAME + "/db/nodes/index.php?id=" + str(node_id) def plc_site_uri(loginbase): - return "https://" + config.PLC_WWW_HOSTNAME + "/db/sites/index.php?site_pattern=" + str(loginbase) + return "https://" + config.PLC_WWW_HOSTNAME + "/db/sites/index.php?pattern=" + str(loginbase) def plc_site_uri_id(site_id): return "https://" + config.PLC_WWW_HOSTNAME + "/db/sites/index.php?id=" + str(site_id) def plc_pcu_uri_id(pcu_id): -- 2.43.0