X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=230e6defa172bb70797c087935a83b24fe57793a;hb=32e64e33bc81735e22024c5a44510848bb3c88df;hp=8e237e7b3dedb6b82ae9cef2399e03ecce9e8cff;hpb=0616603a4abeaf63c2a67026e00a243ff64ba14d;p=monitor.git

diff --git a/Monitor.spec b/Monitor.spec
index 8e237e7..230e6de 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -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
@@ -130,6 +131,8 @@ rm -rf $RPM_BUILD_ROOT
 #################### CLIENT 
 install -D -m 755 monitor-client.init $RPM_BUILD_ROOT/%{_initrddir}/monitor
 install -D -m 644 monitor.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor
+install -D -m 755 timeout.pl $RPM_BUILD_ROOT/usr/bin/timeout.pl
+
 
 #################### SERVER
 install -d $RPM_BUILD_ROOT/usr/share/%{name}
@@ -207,6 +210,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_initrddir}/monitor
 %{_sysconfdir}/cron.d/monitor
+/usr/bin/timeout.pl
 
 %files pcucontrol
 %{python_sitearch}/pcucontrol
@@ -237,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