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
Setting tag monitor-3.1-2
[monitor.git]
/
Monitor.spec
diff --git
a/Monitor.spec
b/Monitor.spec
index
68ed180
..
fc568c7
100644
(file)
--- a/
Monitor.spec
+++ b/
Monitor.spec
@@
-7,7
+7,7
@@
%define name monitor
# keep this version in sync with monitor/monitor_version.py
%define version 3.1
%define name monitor
# keep this version in sync with monitor/monitor_version.py
%define version 3.1
-%define taglevel
1
+%define taglevel
2
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@
-96,10
+96,15
@@
Requires: openssh-clients
Requires: perl-libwww-perl
Requires: perl-IO-Socket-SSL
Requires: MySQL-python
Requires: perl-libwww-perl
Requires: perl-IO-Socket-SSL
Requires: MySQL-python
+Requires: perl-DBD-mysql
Requires: nmap
Requires: nmap
+Requires: mailx
Requires: nc
Requires: rt3
Requires: traceroute
Requires: nc
Requires: rt3
Requires: traceroute
+Requires: sendmail
+# 5.0-18 is when the extra monitor plc-config values were added to myplc default_config.xml
+Requires: myplc >= 5.0-18
Requires: plewww-plekit
Requires: pcucontrol
Requires: plewww-plekit
Requires: pcucontrol
@@
-118,9
+123,8
@@
Summary: Monitor hooks for the PLC server.
Group: Applications/System
Requires: python
Group: Applications/System
Requires: python
-
Requires: monitor-server-deps
Requires: monitor-server-deps
-Requires: PLCWWW >= 4.2
+
# NOTE: removed b/c 'distroname' gets corrupted during build process.
# Requires: bootcd-%{pldistro}-%{distroname}-%{_arch} >= 5.0
# NOTE: removed b/c 'distroname' gets corrupted during build process.
# Requires: bootcd-%{pldistro}-%{distroname}-%{_arch} >= 5.0
@@
-129,7
+133,7
@@
The server side include all python modules and scripts needed to fully
operation, track, and interact with any third-party monitoring software, such
as Zabbix DB.
operation, track, and interact with any third-party monitoring software, such
as Zabbix DB.
-####################################### RunlevelAgent
+#######################################
#
RunlevelAgent
%package runlevelagent
summary: the RunlevelAgent that reports node runlevels
group: applications/system
%package runlevelagent
summary: the RunlevelAgent that reports node runlevels
group: applications/system
@@
-164,7
+168,7
@@
install -d $RPM_BUILD_ROOT/%{python_sitearch}/monitor
# plc.d scripts
install -D -m 644 monitor.functions $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor.functions
install -D -m 755 monitor-server.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor
# plc.d scripts
install -D -m 644 monitor.functions $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor.functions
install -D -m 755 monitor-server.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor
-install -D -m 755 zabbix/monitor-zabbix.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/zabbix
+
#
install -D -m 755 zabbix/monitor-zabbix.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/zabbix
install -D -m 755 nagios/monitor-nagios.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor-nagios
install -D -m 644 nagios/monitor-nagios.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-nagios.cron
install -D -m 755 nagios/monitor-nagios.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor-nagios
install -D -m 644 nagios/monitor-nagios.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-nagios.cron
@@
-173,7
+177,7
@@
install -D -m 644 nagios/monitor-nagios.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron
install -D -m 644 monitor-server.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-server.cron
# apache configuration
install -D -m 644 monitor-server.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor-server.cron
# apache configuration
-install -D -m 644 web/monitorweb
-httpd
.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
+install -D -m 644 web/monitorweb.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/
# we'll install monitor in site-packages install rest to
# /usr/share/monitor
# we'll install monitor in site-packages install rest to
# /usr/share/monitor
@@
-229,13
+233,12
@@
rm -rf $RPM_BUILD_ROOT
/usr/share/%{name}/RunlevelAgent.py*
/usr/share/%{name}/automate-default.sh
/usr/share/%{name}/monitor-default.conf
/usr/share/%{name}/RunlevelAgent.py*
/usr/share/%{name}/automate-default.sh
/usr/share/%{name}/monitor-default.conf
-/usr/share/%{name}/monitor-runlevelagent.init
/usr/share/%{name}/monitor-server.cron
/usr/share/%{name}/monitor-server.init
/usr/share/%{name}/monitor.functions
/usr/share/%{name}/setup.py*
/usr/share/%{name}/threadpool.py*
/usr/share/%{name}/monitor-server.cron
/usr/share/%{name}/monitor-server.init
/usr/share/%{name}/monitor.functions
/usr/share/%{name}/setup.py*
/usr/share/%{name}/threadpool.py*
-/usr/share/%{name}/zabbix.spec
+
#
/usr/share/%{name}/zabbix.spec
/usr/share/%{name}/bootcd
/usr/share/%{name}/commands
/usr/share/%{name}/bootcd
/usr/share/%{name}/commands
@@
-255,7
+258,7
@@
rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/cron.d/monitor-server.cron
%{_sysconfdir}/plc.d/monitor
%{_sysconfdir}/plc.d/monitor.functions
%{_sysconfdir}/cron.d/monitor-server.cron
%{_sysconfdir}/plc.d/monitor
%{_sysconfdir}/plc.d/monitor.functions
-%{_sysconfdir}/plc.d/zabbix
+
#
%{_sysconfdir}/plc.d/zabbix
%{_sysconfdir}/httpd/conf.d
%{python_sitearch}
%{_sysconfdir}/httpd/conf.d
%{python_sitearch}
@@
-283,6
+286,8
@@
export TMPDIR=/var/tmp/
#easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg
#easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz
#easy_install -UZ Elixir
#easy_install -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg
#easy_install -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz
#easy_install -UZ Elixir
+chkconfig sendmail on
+chkconfig crond on
# crazy openssl libs for racadm binary
ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2
# crazy openssl libs for racadm binary
ln -s /lib/libssl.so.0.9.8b /usr/lib/libssl.so.2
@@
-349,6
+354,11
@@
fi
%changelog
%changelog
+* Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-2
+- Add better requirements list, work with TurboGears packaged by fedora,
+- Remove some zabbix files
+- Add a controllers_local.py for custom extensions
+
* Fri May 06 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-1
- last tag before some more major changes
* Fri May 06 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-1
- last tag before some more major changes