X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=a936d24d3c8232bec006cf7001a7a1b192e62f09;hb=51ffc5f9e0936108236a7d7a02e0a60132b5d546;hp=4314cbe92344dcb79022f8cb6039b0ff904eca0a;hpb=7ff61b6b5355f63bc0c0588cb0661507a9343017;p=monitor.git

diff --git a/Monitor.spec b/Monitor.spec
index 4314cbe..a936d24 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -59,6 +59,7 @@ Requires: perl-libwww-perl
 Requires: perl-IO-Socket-SSL 
 Requires: MySQL-python
 Requires: nmap
+Requires: rt3
 
 #Requires: python-sqlalchemy
 #Requires: python-elixir
@@ -77,7 +78,7 @@ Group: Applications/System
 Requires: python
 
 Requires: monitor-server-deps
-Requires: rt3 == 3.4.1
+Requires: monitor-pcucontrol
 Requires: PLCWWW >= 4.2
 Requires: bootcd-planetlab-i386 >= 4.2
 
@@ -213,8 +214,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %post server-deps
 easy_install -UZ Elixir
+easy_install -UZ ElementTree
+easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz
 easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg
 
+# NOTE: add the default xml stuff if it's not already in the default xml config.
+if ! grep '<category id="plc_monitor">' /etc/planetlab/default_config.xml ; then 
+    sed -i 's|<category id="plc_net">| <category id="plc_monitor">\n <name>Monitor Service Configuration</name>\n <description>Monitor</description>\n <variablelist>\n <variable id="enabled" type="boolean">\n <name>Enabled</name>\n <value>true</value>\n <description>Enable on this machine.</description>\n </variable>\n <variable id="email">\n <value></value>\n </variable>\n <variable id="dbpassword">\n <value></value>\n </variable>\n <variable id="host" type="hostname">\n <name>Hostname</name>\n <value>pl-virtual-06.cs.princeton.edu</value>\n <description>The fully qualified hostname.</description>\n </variable>\n <variable id="ip" type="ip">\n <name>IP Address</name>\n <value/>\n <description>The IP address of the monitor server.</description>\n </variable>\n </variablelist>\n </category>\n <category id="plc_net">|' /etc/planetlab/default_config.xml
+fi
+
+
 %post server
 # TODO: this will be nice when we have a web-based service running., such as
 # 		an API server or so on.