X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=3a65da6bd5ccc8bf7e31b23d64d60d89154f538c;hb=b670d6e34116c02c134e213dc20ac683851b491f;hp=ea269b318d8f86a6fcbc92ccfd153ea9287e590e;hpb=d3c523524570c8cf2a88b532b6665525d4c41260;p=myplc.git diff --git a/myplc.spec b/myplc.spec index ea269b3..3a65da6 100644 --- a/myplc.spec +++ b/myplc.spec @@ -4,8 +4,8 @@ %define url $URL$ %define name myplc -%define version 4.2 -%define taglevel 10 +%define version 4.3 +%define taglevel 11 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -17,15 +17,55 @@ License: PlanetLab Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) -Requires: tar - -Provides: myplc +# as much as possible, requires should go in the subpackages specfile +Requires: bzip2 +Requires: tar +Requires: less +Requires: sendmail +Requires: sendmail-cf +Requires: openssl +Requires: expect +Requires: php-pgsql +Requires: curl +Requires: rsync +Requires: python-devel +Requires: vixie-cron +Requires: yum +Requires: PyXML +Requires: createrepo +Requires: cpio +Requires: wget +Requires: php +Requires: openssh +Requires: dnsmasq +Requires: diffutils +Requires: gzip +Requires: vim-minimal +Requires: findutils +Requires: xmlsec1 +Requires: xmlsec1-openssl +# planetlab stuff +Requires: bootmanager +Requires: bootcd-%{pldistro}-%{_arch} +Requires: PLCWWW +Requires: www-register-wizard +Requires: nodeconfig +Requires: PLCAPI +Requires: bootstrapfs-%{pldistro}-%{_arch} +Requires: myplc-docs +Requires: myplc-release + +# argh - ugly - we might wish to use something from build/config.%{pldistro} instead +%if "%{pldistro}" == "onelab" +Requires: dummynet_image +%endif %define debug_package %{nil} @@ -33,43 +73,20 @@ Provides: myplc MyPLC is a complete PlanetLab Central (PLC) portable installation contained within a chroot jail. The default installation consists of a web server, an XML-RPC API server, a boot server, and a database -server: the core components of PLC. All PLC services are started up and +server: the core components of PLC. The installation may be customized +through a graphical interface. All PLC services are started up and shut down through a single System V init script installed in the host -system. The related Web Interface is now separately packaged -in the PLCWWW component. +system. %prep %setup -q %build -pushd MyPLC -./build.sh %{pldistro} -popd %install -rm -rf $RPM_BUILD_ROOT - pushd MyPLC - -# -# myplc -# - -# Install host startup script and configuration file -install -D -m 755 host.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/plc -install -D -m 644 plc.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/plc - -# Create convenient symlink -install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir} -ln -sf /plc/data/etc/planetlab $RPM_BUILD_ROOT/%{_sysconfdir}/planetlab - -# Install root filesystem -install -d -m 755 $RPM_BUILD_ROOT/plc/root -install -D -m 644 root.img $RPM_BUILD_ROOT/plc/root.img - -# Install data directory -find data | cpio -p -d -u $RPM_BUILD_ROOT/plc/ - +rm -rf $RPM_BUILD_ROOT +./build.sh %{pldistro} $RPM_BUILD_ROOT popd %clean @@ -83,12 +100,12 @@ if [ -n "$SUDO_USER" ] ; then # /usr/bin/sudo get created with non-readable permissions. find . -not -perm +0600 -exec chmod u+rw {} \; # Allow user to delete the built RPM(s) - chown -h -R $SUDO_USER %{_rpmdir}/%{_arch} + [ -d %{_rpmdir}/noarch ] && chown -h -R $SUDO_USER %{_rpmdir}/noarch fi %pre if [ -x %{_sysconfdir}/init.d/plc ] ; then - %{_sysconfdir}/init.d/plc safestop + %{_sysconfdir}/init.d/plc stop fi # Old versions of myplc used to ship with a bootstrapped database and @@ -108,15 +125,15 @@ fi # 0 = install, 1 = upgrade if [ $1 -gt 0 ] ; then for dir in /var/lib/pgsql/data /etc/planetlab ; do - if [ -d /plc/data/$dir ] ; then - echo "Preserving /plc/data/$dir" - mkdir -p /plc/data/$dir.rpmsave - tar -C /plc/data/$dir -cpf - . | \ - tar -C /plc/data/$dir.rpmsave -xpf - + if [ -d $dir ] ; then + echo "Preserving $dir" + mkdir -p $dir.rpmsave + tar -C $dir -cpf - . | \ + tar -C $dir.rpmsave -xpf - # Except for the default configuration file and DTD, which # really should be considered for upgrade. - rm -f /plc/data/$dir.rpmsave/{default_config.xml,plc_config.dtd} + rm -f $dir.rpmsave/{default_config.xml,plc_config.dtd} fi done fi @@ -126,16 +143,20 @@ if [ -x /sbin/chkconfig ] ; then /sbin/chkconfig --add plc /sbin/chkconfig plc on fi +pushd /usr/share/myplc &> /dev/null +python plc_config.py build +python plc_config.py install +popd &> /dev/null %triggerpostun -- %{name} # 0 = erase, 1 = upgrade if [ $1 -gt 0 ] ; then for dir in /var/lib/pgsql/data /etc/planetlab ; do - if [ -d /plc/data/$dir.rpmsave -a -d /plc/data/$dir ] ; then - echo "Merging /plc/data/$dir" - if tar -C /plc/data/$dir.rpmsave -cpf - . | \ - tar -C /plc/data/$dir -xpf - ; then - rm -rf /plc/data/$dir.rpmsave + if [ -d $dir.rpmsave -a -d $dir ] ; then + echo "Merging $dir" + if tar -C $dir.rpmsave -cpf - . | \ + tar -C $dir -xpf - ; then + rm -rf $dir.rpmsave fi fi done @@ -144,7 +165,7 @@ fi %preun # 0 = erase, 1 = upgrade if [ $1 -eq 0 ] ; then - %{_sysconfdir}/init.d/plc safestop + %{_sysconfdir}/init.d/plc stop if [ -x /sbin/chkconfig ] ; then /sbin/chkconfig plc off /sbin/chkconfig --del plc @@ -154,21 +175,86 @@ fi %files %defattr(-,root,root,-) # Host startup script and configuration file -%{_sysconfdir}/init.d/plc -%{_sysconfdir}/sysconfig/plc +/etc/init.d/plc +/etc/plc.d +/etc/planetlab +/etc/plc_sliceinitscripts/sirius +/etc/support-scripts/gen_aliases.py* +/etc/support-scripts/renew_reminder.py* +/etc/support-scripts/renew_reminder_logrotate +/usr/bin/plc-config +/usr/bin/plc-config-tty +/usr/bin/db-config +/usr/bin/dns-config +/usr/bin/plc-map.py* +/usr/bin/plc-kml.py* +/usr/bin/refresh-peer.py* +/usr/bin/clean-empty-dirs.py* +/usr/bin/mtail.py* +/usr/bin/plc-check-ssl-peering.py* +/usr/bin/plc-orphan-accounts.py* +/usr/share/myplc -# Symlink to /etc/planetlab within data directory -%{_sysconfdir}/planetlab +%changelog +* Tue May 19 2009 Thierry Parmentelat - MyPLC-4.3-11 +- first draft of plc-orpha-accounts.py, and rename check-ssl-peering into plc-<> -# Root filesystem -/plc/root.img -/plc/root +* Wed May 06 2009 Thierry Parmentelat - MyPLC-4.3-9 +- fix issue in db-config that prevented correct operation -# Data directory -%dir /plc/data -%config(noreplace) /plc/data/* +* Wed May 06 2009 Thierry Parmentelat - MyPLC-4.3-8 +- remove support for chroot-based packaging - no crond nor syslog step anymore +- plc init script now named plc.init instead of former guest.init + +* Mon May 04 2009 Stephen Soltesz - MyPLC-4.3-7 +- add Monitor to docs build + +* Wed Apr 29 2009 Marc Fiuczynski - MyPLC-4.3-6 +- plc_config.py and plc-config-tty: generalized to work for more diverse +- MyPLC configurations. +- plc.d/httpd: only update httpd_conf with /data for chroot'ed MyPLC +- deployments and increase the memory limits in php.ini +- plc.d/crond: add --full option to vacuumdb + +* Tue Apr 07 2009 Thierry Parmentelat - MyPLC-4.3-5 +- avoid generating ssl certificates for disabled services among www api boot + +* Mon Mar 30 2009 Thierry Parmentelat - MyPLC-4.3-4 +- cleaned up old entries in db-config +- mtail more robust + +* Tue Mar 24 2009 Thierry Parmentelat - MyPLC-4.3-3 +- php include path tweaked for plekit includes +- reviewed myplc (fka native) packaging dependencies +- renumbered 4.3 + +* Thu Jan 29 2009 Thierry Parmentelat - MyPLC-4.3-2 +- rename myplc into myplc-chroot and myplc-native into myplc +- new settings (shortname & hrn_root) for local peer + +* Wed Sep 10 2008 Thierry Parmentelat - MyPLC-4.3-1 +- First iteration of new data model +- Bunch of various fixes + +* Tue May 20 2008 Faiyaz Ahmed - MyPLC-4.2-15 +- Removed proper ops from planetflow slice. + +* Wed May 14 2008 Thierry Parmentelat - MyPLC-4.2-14 +- myplc-native requires myplc-docs +- fixed doc build by locating locally installed DTDs at build-time + +* Sun May 11 2008 Thierry Parmentelat - MyPLC-4.2-13 +- turn myplc-docs off for now + +* Sat May 10 2008 Thierry Parmentelat - MyPLC-4.2-12 +- figures in doc package + +* Fri May 09 2008 Thierry Parmentelat - MyPLC-4.2-11 +- no more doc packaged outside of myplc-docs - doc/ cleaned up +- chroot packaging does not have docs anymore +- 'cvs' and 'dev' not required from myplc-native anymore +- cosmetic change in kml output -%changelog * Thu May 08 2008 Thierry Parmentelat - MyPLC-4.2-10 - defaults for *_IP conf vars now void, expect more accurate /etc/hosts - gethostbyname uses python rather than perl (hope this shrinks deps) @@ -217,66 +303,7 @@ fi - sirius initscript updated - slice auto renewal fixed -* Thu Jan 31 2008 Thierry Parmentelat - myplc-4.2-1 myplc-4.2-2 -- knows how to checkpoint and restore -- packages step more robust, in particular with empty node repository -- miscell tweaks for native packaging - -* Wed Jan 09 2008 Thierry Parmentelat - myplc-4.0-15 myplc-4.2-0 -moving to 4.2 - no change - -* Fri Jan 19 2007 Mark Huang - 0.5-3 -- Split off myplc-devel into separate spec file, so that it can be - built standalone. - -* Tue Aug 22 2006 Mark Huang - 0.4-3, 0.5-3 -- MyPLC 0.4 RC3. -- Fix upgrade path from RC1. -- Always regenerate plc_config.xml at first startup -- Upgrade kernel, iptables, vnet to 2.6.17-1.2142_FC4-3.planetlab -- Minor PlanetFlow fixes -- pl_mom/swapmon: Minor fixes -- bootcd: Added Supermicro IPMI support -- bootmanager: Cleanup, fixed check for new disks - -* Wed Aug 09 2006 Thierry Parmentelat -- introduces variable %{build_devel} to allow custom sites to skip building - the myplc-devel package. - -* Thu Jul 13 2006 Mark Huang - 0.4-2, 0.5-2 -- MyPLC 0.4 RC2. -- Fix many spec files (License replaces Copyright). -- Fix kernel build under gcc32 (module verification bug). -- Fix vnet build under gcc32 -- Fix PlanetFlow. MySQL RPM postinstall script no longer starts the - server. Also, get hostnames list from PLC_WWW_HOST, not - www.planet-lab.org. -- Fix pl_mom/bwmon to use cached values if NM is unresponsive -- Fix pl_mom/swapmon reset logic to avoid endless loops -- Remove ksymoops, add kernel-smp to standard PlanetLab package group -- Add kernel-smp boot support to bootmanager -- Add badblock search support to bootmanager -- Build development environment (myplc-devel). Add support for - building myplc itself inside myplc-devel. -- Move step-specific initialization to appropriate plc.d scripts -- Fix postgresql startup failure when bootstrapping -- Allow CA to be configured for each SSL certificate set. Stop doing - root CA stuff, this is outside the scope of MyPLC. MyPLC now only - generates self-signed certificates, but supports replacement of the - self-signed certificates with real certifcates signed by another CA, - as long as the CA is specified. -- Self-sign the MA/SA SSL certificate (and by extension, the MA/SA API - certificate). -- pl_mom: Workarounds for when NM queries time out. -- plc_api: Honor PLC_MAIL_ENABLED. - -* Wed Jul 6 2006 Mark Huang - 0.4-1, 0.5-1 -- First stable release of MyPLC 0.4 RC1. - -* Wed Apr 5 2006 Mark Huang - 0.2-1 -- Basic functionality complete. Consolidate into a single package - installed in /plc. - -* Fri Mar 17 2006 Mark Huang - 0.1-1 -- Initial build. +* Fri Aug 31 2007 Marc E. Fiuczynski +- initial build. +%define module_current_branch 4.2