Merge branch 'master' of git://git.planet-lab.org/monitor

diff --combined Monitor.spec
index 5b79c11,d461f32..68ed180
--- 1/Monitor.spec
--- 2/Monitor.spec
+++ b/Monitor.spec
@@@ -7,7 -7,7 +7,7 @@@
  %define name monitor
  # keep this version in sync with monitor/monitor_version.py
  %define version 3.1
- %define taglevel 0
+ %define taglevel 1
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  %global python_sitearch       %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@@ -99,11 -99,8 +99,11 @@@ Requires: MySQL-pytho
  Requires: nmap
  Requires: nc
  Requires: rt3
 +Requires: traceroute
  
  Requires: plewww-plekit
 +Requires: pcucontrol
 +Requires: TurboGears
  
  #Requires: zabbix-client
  #Requires: zabbix-gui
@@@ -121,8 -118,8 +121,8 @@@ Requires: pytho
  
  Requires: monitor-server-deps
  Requires: PLCWWW >= 4.2
 -Requires: bootcd-%{pldistro}-%{distroname}-%{_arch} >= 5.0
 -Requires: pcucontrol
 +# NOTE: removed b/c 'distroname' gets corrupted during build process.
 +# Requires: bootcd-%{pldistro}-%{distroname}-%{_arch} >= 5.0
  
  %description server
  The server side include all python modules and scripts needed to fully
@@@ -280,9 -277,9 +280,9 @@@ rm -rf $RPM_BUILD_ROO
  # by fedora 8 (our current deployment) doesn't match the version
  # requirements.
  export TMPDIR=/var/tmp/
 -easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg
 -easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz
 -easy_install -UZ Elixir
 +#easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg
 +#easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz
 +#easy_install -UZ Elixir
  
  # crazy openssl libs for racadm binary
  ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2
@@@ -311,6 -308,20 +311,6 @@@ if ! plc-config --category plc_monitor 
                        --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
  fi
  
 -# zabbix:
 -if ! plc-config --category plc_zabbix --variable enabled ; then
 -      plc-config --category plc_zabbix --variable enabled --value false \
 -                      --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 -fi
 -if ! plc-config --category plc_zabbix --variable host ; then
 -      plc-config --category plc_zabbix --variable host --value localhost.localdomain \
 -                      --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 -fi
 -if ! plc-config --category plc_zabbix --variable ip ; then
 -      plc-config --category plc_zabbix --variable ip --value "" \ 
 -                      --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 -fi
 -
  %post nagios
  # TODO: do as much as possible to get the host setup and running.
  #chkconfig --add monitor-nagios
@@@ -349,6 -360,9 +349,9 @@@ f
  
  
  %changelog
+ * Fri May 06 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-1
+ - last tag before some more major changes
+ 
  * Thu May 20 2010 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-35
  - Add CSV link on Advanced query
  - Preparing to branch