diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d6ffbeadab..c3d96e1f6b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2010-09-26 Sancho Lerena + + * pandora_console.spec: Updated some missing deps. + + * operation/agentes/estado_generalagente.php: Fixed + notice on empty array. + + * pandora_console.redhat.spec: Specific SPEC for redhat. + 2010-09-24 Sancho Lerena * install.php: Updated version and build diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 88e942aa31..3f467348bb 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -163,10 +163,7 @@ echo ''.$field['name'].print_help_tip (__('Custom field'), true).''; $custom_value = get_db_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente)); diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec new file mode 100755 index 0000000000..c2fc5b7204 --- /dev/null +++ b/pandora_console/pandora_console.redhat.spec @@ -0,0 +1,92 @@ +# +# Pandora FMS Console +# +%define name pandorafms_console +%define version 3.2 +%define release 2 +%define httpd_name httpd +# User and Group under which Apache is running +%define httpd_name httpd +%define httpd_user apache +%define httpd_group apache + +# Evaluate PHP version +%define phpver_lt_430 %(out=`rpm -q --queryformat='%{VERSION}' php` 2>&1 >/dev/null || out=0 ; out=`echo $out | tr . : | sed s/://g` ; if [ $out -lt 430 ] ; then out=1 ; else out=0; fi ; echo $out) + +Summary: Pandora FMS Console +Name: %{name} +Version: %{version} +Release: %{release} +License: GPL +Vendor: Artica ST +#Source0: %{name}-%{version}-%{revision}.tar.gz +Source0: %{name}-%{version}.tar.gz +Source1: extras/%{name}-logrotate +URL: http://www.pandorafms.com +Group: Productivity/Networking/Web/Utilities +Packager: Sancho Lerena +Prefix: /var/www/html +BuildRoot: %{_tmppath}/%{name} +BuildArchitectures: noarch +AutoReq: 0 +Requires: httpd >= 2.0.0 +Requires: php >= 4.3.0 +Requires: php-gd, php-snmp, php-pear +Requires: php-mysql, php-ldap, php-mbstring, php, php-zip +Requires: php-pear-DB +Requires: xorg-x11-fonts-75dpi, xorg-x11-fonts-misc +Requires: graphviz, graphviz-php +Provides: %{name}-%{version} + +%description +The Web Console is a web application that allows to see graphical reports, state of every agent, also to access to the information sent by the agent, to see every monitored parameter and to see its evolution throughout the time, to form the different nodes, groups and users of the system. It is the part that interacts with the final user, and that will allows you to administer the system. + +%prep +rm -rf $RPM_BUILD_ROOT + +%setup -q -n pandora_console + +%build + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_console +#mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/pandora/data_in +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ +cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_console +rm $RPM_BUILD_ROOT%{prefix}/pandora_console/*.spec +rm $RPM_BUILD_ROOT%{prefix}/pandora_console/pandora_console_install +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/pandora_console + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +# Has an install already been done, if so we only want to update the files +# push install.php aside so that the console works immediately using existing +# configuration. +# +if [ -f %{prefix}/pandora_console/include/config.php ] ; then + mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done +else + echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." +fi + + +%preun + +# Upgrading +if [ "$1" = "1" ]; then + exit 0 +fi + +%files +%defattr(0644,%{httpd_user},%{httpd_group},0755) +%docdir %{prefix}/pandora_console/docs +%{prefix}/pandora_console + +%defattr(0644,root,root) +%{_sysconfdir}/logrotate.d/pandora_console + +%defattr(770,pandora,%{httpd_group}) +/var/spool/pandora/data_in diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index b029a45d71..c32838917f 100755 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -27,7 +27,7 @@ Prefix: /srv/www/htdocs BuildRoot: %{_tmppath}/%{name} BuildArchitectures: noarch AutoReq: 0 -Requires: apache2 +Requires: apache2, apache2-mod_php5 Requires: php >= 4.3.0 Requires: php5-gd, php5-snmp, php5-pear, php5-json, php5-gettext Requires: php5-mysql, php5-ldap, php5-mbstring, php5