plewww-GITPATH := git://git.planet-lab.org/plewww@plewww-4.3-63
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
-Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
+monitor-GITPATH := git://git.planet-lab.org/monitor.git@monitor-3.1-2
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
#
# monitor
#
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
monitor-SPEC := Monitor.spec
monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
plcrt-SPEC := plcrt.spec
ALL += plcrt
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-zabbix-DEVEL-RPMS += python-cherrypy
-ALL += zabbix
-
#
# pyopenssl
#
# myplc-docs only contains docs for PLCAPI and NMAPI, but
# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := myplc plcapi nodemanager Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs