X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=f4e0cb34820fbbecfe8687f1d02a195c4c9ecacc;hb=ab835ed0e99bc4c57728c8cfa61856d15dfc34f5;hp=f8986d98c4075e444dfa9dc8786760dc04d760ea;hpb=3ba0f14d951147802721a864b0e8f38990e551f6;p=monitor.git

diff --git a/Monitor.spec b/Monitor.spec
index f8986d9..f4e0cb3 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -6,7 +6,7 @@
 
 %define name monitor
 %define version 3.0
-%define taglevel 18
+%define taglevel 19
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -62,6 +62,7 @@ Requires: perl-libwww-perl
 Requires: perl-IO-Socket-SSL 
 Requires: MySQL-python
 Requires: nmap
+Requires: nc
 Requires: rt3
 
 Requires: plewww-plekit
@@ -240,34 +241,36 @@ if grep 'pam_loginuid.so' /etc/pam.d/crond ; then
 fi
 
 # NOTE: enable monitor by default, since we're installing it.
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_monitor --variable enabled --value true
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_monitor --variable from_email --value monitor@localhost.localdomain
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_monitor --variable cc_email --value monitor@localhost.localdomain
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_monitor --variable rt_queue --value support
-
-# NOTE: setup default values until myplc includes them by default.
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_rt --variable enabled --value false
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_rt --variable host --value localhost.localdomain
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_rt --variable ip --value ""
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_rt --variable web_user --value root
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_rt --variable web_password --value password
+if ! plc-config --category plc_monitor --variable enabled ; then 
+	plc-config --category plc_monitor --variable enabled --value true \
+			--save /etc/planetlab/configs/site.xml  /etc/planetlab/configs/site.xml 
+fi
+if ! plc-config --category plc_monitor --variable from_email ; then
+	plc-config --category plc_monitor --variable from_email --value monitor@localhost.localdomain \
+			--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+fi
+if ! plc-config --category plc_monitor --variable cc_email ; then
+	plc-config --category plc_monitor --variable cc_email --value monitor@localhost.localdomain \
+			--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+fi
+if ! plc-config --category plc_monitor --variable rt_queue ; then
+	plc-config --category plc_monitor --variable rt_queue --value support \
+			--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+fi
 
 # zabbix:
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_zabbix --variable enabled --value false
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_zabbix --variable host --value localhost.localdomain
-plc-config --save /etc/planetlab/configs/site.xml \
-			--category plc_zabbix --variable ip --value ""
+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 server
 # TODO: this will be nice when we have a web-based service running., such as
@@ -300,6 +303,13 @@ fi
 
 
 %changelog
+* Mon Aug 17 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-19
+- Major increment -
+- adds multiple features and web changes
+- adds new fields to db
+- improved layout
+- general improvements otherwise
+
 * Sun Jun 28 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-18
 - bug fixes.
 - improved templates and views