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
Remove missing dirs from spec file
[monitor.git]
/
Monitor.spec
diff --git
a/Monitor.spec
b/Monitor.spec
index
658c07a
..
f47a12c
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)" )
@@
-133,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
@@
-168,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
@@
-233,21
+233,20
@@
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}/config.d
/usr/share/%{name}/bootcd
/usr/share/%{name}/commands
/usr/share/%{name}/config.d
-/usr/share/%{name}/cron.d
+
#
/usr/share/%{name}/cron.d
/usr/share/%{name}/docs
/usr/share/%{name}/keys
/usr/share/%{name}/docs
/usr/share/%{name}/keys
-/usr/share/%{name}/log
+
#
/usr/share/%{name}/log
/usr/share/%{name}/statistics
/usr/share/%{name}/tests
/usr/share/%{name}/tools
/usr/share/%{name}/statistics
/usr/share/%{name}/tests
/usr/share/%{name}/tools
@@
-259,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}
@@
-355,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