git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch 3.0 for module Monitor created (as new trunk) from tag Monitor-2.0-1
[monitor.git]
/
zabbix.spec
diff --git
a/zabbix.spec
b/zabbix.spec
index
484ed8b
..
2a408e3
100644
(file)
--- a/
zabbix.spec
+++ b/
zabbix.spec
@@
-3,7
+3,7
@@
%define _prefix /usr/local/zabbix
Name: zabbix
%define _prefix /usr/local/zabbix
Name: zabbix
-Version: 1.6
+Version: 1.6
.2
Release: 1
Group: System Environment/Daemons
License: GPL
Release: 1
Group: System Environment/Daemons
License: GPL
@@
-155,6
+155,9
@@
TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX`
# TODO: setup Server=, Hostname=,
SERVER=`grep PLC_MONITOR_HOST /etc/planetlab/plc_config | tr "'" ' ' | awk '{print $2}'`
# TODO: setup Server=, Hostname=,
SERVER=`grep PLC_MONITOR_HOST /etc/planetlab/plc_config | tr "'" ' ' | awk '{print $2}'`
+if [ -z "$SERVER" ] ; then
+ SERVER=128.112.139.116
+fi
HOST=`hostname`
sed -e "s#Hostname=.*#Hostname=$HOST#g" \
-e "s#Server=.*#Server=$SERVER#g" \
HOST=`hostname`
sed -e "s#Hostname=.*#Hostname=$HOST#g" \
-e "s#Server=.*#Server=$SERVER#g" \
@@
-180,6
+183,7
@@
rm -f $TMP_FILE
chkconfig --add zabbix_agentd
chkconfig zabbix_agentd on
chkconfig --add zabbix_agentd
chkconfig zabbix_agentd on
+service zabbix_agentd start
%post server
%post server
@@
-286,6
+290,9
@@
rm -f %{zabbix_logdir}/zabbix_agentd.log
%{zabbix_webdir}
%changelog
%{zabbix_webdir}
%changelog
+* Fri Feb 27 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-1
+- preparing to make a 2.0 branch for monitor.
+
* Mon Jan 05 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-0
- new changes are significantly different, that I'm upping the number for clarity.
* Mon Jan 05 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-2.0-0
- new changes are significantly different, that I'm upping the number for clarity.
@@
-297,3
+304,9
@@
rm -f %{zabbix_logdir}/zabbix_agentd.log
- 1.1beta2
- initial packaging
- 1.1beta2
- initial packaging
+
+%define module_current_branch 2.0
+
+%define taglevel 0
+
+%define version 3.0