git://git.onelab.eu
/
mom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk
[mom.git]
/
pl_mom.spec
diff --git
a/pl_mom.spec
b/pl_mom.spec
index
394e216
..
14fae3c
100644
(file)
--- a/
pl_mom.spec
+++ b/
pl_mom.spec
@@
-1,6
+1,6
@@
%define name pl_mom
%define name pl_mom
-%define version
0.7
-%define release
10
%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version
2.2
+%define release
01
%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Summary: PlanetLab node monitoring tools
Name: %{name}
Summary: PlanetLab node monitoring tools
Name: %{name}
@@
-28,9
+28,6
@@
process memory usage. At 90% utilization, resets the slice that is
consuming the most physical memory. At 95% utilization, it reboots the
machine to avoid a crash.
consuming the most physical memory. At 95% utilization, it reboots the
machine to avoid a crash.
-bwmon is a cron job that monitors the average bandwidth usage of each
-slice and enforces a daily byte limit for each slice.
-
pl_mop is a cron job that "fixes" various common problems with nodes
(dead services, ext3 corruption, zombie SSH sessions, etc.).
pl_mop is a cron job that "fixes" various common problems with nodes
(dead services, ext3 corruption, zombie SSH sessions, etc.).
@@
-46,17
+43,14
@@
rm -rf $RPM_BUILD_ROOT
install -D -m 644 pl_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/pl_mom.py
# Bandwidth monitor (bwmon), run periodically
install -D -m 644 pl_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/pl_mom.py
# Bandwidth monitor (bwmon), run periodically
-install -D -m 755 bwmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/bwmon.py
+
#
install -D -m 755 bwmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/bwmon.py
# Swap monitoring daemon (swapmon)
install -D -m 755 swapmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/swapmon.py
install -D -m 755 swapmon.init $RPM_BUILD_ROOT/%{_initrddir}/swapmon
# Cleanup script
# Swap monitoring daemon (swapmon)
install -D -m 755 swapmon.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/swapmon.py
install -D -m 755 swapmon.init $RPM_BUILD_ROOT/%{_initrddir}/swapmon
# Cleanup script
-install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/local/planetlab/bin/pl_mop.sh
-
-# Tests and restarts NM
-install -D -m 755 nm_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/nm_mom.py
+install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/bin/pl_mop.sh
# Runs pl_mop and bwmon periodically
install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom
# Runs pl_mop and bwmon periodically
install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom
@@
-99,12
+93,10
@@
exit 0
%files
%defattr(-, root, root, -)
%files
%defattr(-, root, root, -)
-%{_datadir}/%{name}/pl_mom.py
-%{_datadir}/%{name}/nm_mom.py
-%{_datadir}/%{name}/bwmon.py
-%{_datadir}/%{name}/swapmon.py
+%{_datadir}/%{name}/pl_mom.py*
+%{_datadir}/%{name}/swapmon.py*
%{_initrddir}/swapmon
%{_initrddir}/swapmon
-/usr/
local/planetlab/
bin/pl_mop.sh
+/usr/bin/pl_mop.sh
%{_sysconfdir}/cron.d/pl_mom
%changelog
%{_sysconfdir}/cron.d/pl_mom
%changelog