merged into Monitor.spec

diff --git a/monitor-server.spec b/monitor-server.spec
deleted file mode 100644 (file)
index 1604735..0000000
--- a/monitor-server.spec
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# $Id$
-# 
-
-%define url $URL: svn+ssh://svn.planet-lab.org/svn/Monitor/trunk/monitor-server.spec $
-
-%define name monitor-server
-%define version 1.1
-%define taglevel 0
-
-%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
-
-
-Summary: Monitor backend scripts for server
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Source0: %{name}-%{version}.tar.bz2
-License: GPL
-Group: Applications/System
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
-
-Requires: curl
-Requires: coreutils
-Requires: openssh-clients
-Requires: perl-libwww-perl
-Requires: perl-IO-Socket-SSL 
-Requires: MySQL-python
-Requires: rt3 == 3.4.1
-Requires: nmap
-
-Requires: PLCWWW >= 4.2
-Requires: bootcd-planetlab-i386 >= 4.2
-
-%description
-Scripts for polling PLC, the node, and PCU status.  Also a collection of
-command-line utilities for querying the status database. 
-
-%prep
-%setup -q
-
-%build
-# TODO: note that we should build the cmdamt/ with g++
-cd cmdamt
-export TMPDIR=$PWD/tmp
-make
-cd ..
-
-%install
-
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}
-mkdir -p $RPM_BUILD_ROOT/data/var/lib/%{name}
-mkdir -p $RPM_BUILD_ROOT/data/var/lib/%{name}/archive-pdb
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}
-mkdir -p $RPM_BUILD_ROOT/var/lib/%{name}/archive-pdb
-mkdir -p $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/
-
-echo " * Installing core scripts"
-rsync -a --exclude www --exclude archive-pdb --exclude .svn --exclude CVS \
-         ./ $RPM_BUILD_ROOT/usr/share/%{name}/
-
-echo " * Installing web pages"
-rsync -a www/ $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/
-
-echo " * Installing cron job for automated polling"
-install -D -m 644 %{name}.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/%{name}.cron
-echo " * TODO: Setting up Monitor account in local MyPLC"
-# TODO: 
-
-mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}/monitor
-install -d -D -m 755 monitor $RPM_BUILD_ROOT/%{python_sitearch}/monitor
-# TODO: need a much better way to do this.
-rsync -a monitor/ $RPM_BUILD_ROOT/%{python_sitearch}/monitor/
-#for file in __init__.py database.py config.py ; do 
-#      install -D -m 644 monitor/$file $RPM_BUILD_ROOT/%{python_sitearch}/monitor/$file
-#done
-install -D -m 755 threadpool.py $RPM_BUILD_ROOT/%{python_sitearch}/threadpool.py
-
-touch $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php
-chmod 777 $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/monitorconfig.php
-
-install -D -m 755 monitor-default.conf $RPM_BUILD_ROOT/etc/monitor.conf
-cp $RPM_BUILD_ROOT/usr/share/%{name}/monitorconfig-default.py $RPM_BUILD_ROOT/usr/share/%{name}/monitorconfig.py
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%config /usr/share/%{name}/monitorconfig.py
-%config /etc/monitor.conf
-/usr/share/%{name}
-/var/lib/%{name}
-/var/www/cgi-bin/monitor
-%{_sysconfdir}/cron.d/%{name}.cron
-%{python_sitearch}/threadpool.py
-%{python_sitearch}/threadpool.pyc
-%{python_sitearch}/threadpool.pyo
-%{python_sitearch}/monitor
-
-%post
-echo "Post processing"
-# TODO: this will be nice when we have a web-based service running., such as
-#              an API server or so on.
-# TODO: create real monitorconfig.py from monitorconfig-default.py
-# TODO: create monitorconfig.php using phpconfig.py 
-# TODO: create symlink in /var/lib/monitor-server for chroot environments
-# TODO: update the content of automate_pl03.sh 
-# TODO: Use the installed version of bootcd to create custom boot images. ( or, use the api now).
-
-#chkconfig --add monitor-server
-#chkconfig monitor-server on
-
-%changelog
-* Tue Oct 14 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-1.0-10
-- an update to the latest tag.  looks like I actually needed to update the tags
-- file more than this.
-
-* Thu Sep 25 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-1.0-9
-- includes all removals of 'monitorconfig'
-
-* Wed Sep 24 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-1.0-8
-- These are all changes in the latest Monitor code.  I will branch this version
-- next, before making additional large changes.
-
-* Mon Sep 01 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - Monitor-1.0-7
-- Checkpointing current version for 4.2-rc21 - many many changes
-
-* Mon Aug 11 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-1.0-6
-- This is a major tag of every thing.  probably needs a very different release
-- number.
-
-* Wed Jul 30 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-server-1.0-5
-- initial creation of server-side package
-
-%define module_current_branch 1.0