X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Monitor.spec;h=f8986d98c4075e444dfa9dc8786760dc04d760ea;hb=be3de073848942591cf35cc71c514bf75fa21906;hp=91590d20e8b01c93d69658ee300bed2db0611228;hpb=0a314bb80c378e576c60e16cdf44c631ea953cd4;p=monitor.git

diff --git a/Monitor.spec b/Monitor.spec
index 91590d2..f8986d9 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -130,6 +130,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 +209,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_initrddir}/monitor
 %{_sysconfdir}/cron.d/monitor
+/usr/bin/timeout.pl
 
 %files pcucontrol
 %{python_sitearch}/pcucontrol
@@ -229,23 +232,42 @@ easy_install --build-directory /var/tmp -UZ Elixir
 
 # crazy openssl libs for racadm binary
 ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2
-mkdir /usr/share/monitor/.ssh
-chmod 700 /usr/share/monitor/.ssh
+mkdir %{_datadir}/%{name}/.ssh
+chmod 700 %{_datadir}/%{name}/.ssh
 
 if grep 'pam_loginuid.so' /etc/pam.d/crond ; then
     sed -i -e 's/^session    required   pam_loginuid.so/#session    required   pam_loginuid.so/g' /etc/pam.d/crond
 fi
-# 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
-if ! grep '<category id="plc_zabbix">' /etc/planetlab/default_config.xml ; then 
-    sed -i 's|<category id="plc_net">| <category id="plc_zabbix">\n <name>Zabbix Configuration</name>\n <description>Zabbix</description>\n <variablelist>\n <variable id="enabled" type="boolean">\n <name>Enabled</name>\n <value>false</value>\n <description>Enable on this machine.</description>\n </variable>\n <variable id="host" type="hostname">\n <name>Hostname</name>\n <value>localhost.localdomain</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 Zabbix server.</description>\n </variable>\n </variablelist>\n </category>\n <category id="plc_net">|' /etc/planetlab/default_config.xml
-fi
 
 # NOTE: enable monitor by default, since we're installing it.
-plc-config --save /etc/planetlab/default_config.xml \
+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
+
+# 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 ""
 
 %post server
 # TODO: this will be nice when we have a web-based service running., such as