From b42be39ff01f53ace4b72726c27842a22739f6a3 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 5 May 2009 16:12:02 +0000 Subject: [PATCH] no more support for chroot-based packaging --- Makefile | 2 +- README-devel.txt | 11 -- build-chroot.sh | 139 ----------------- build.sh | 4 +- host.init | 232 ---------------------------- myplc-chroot.spec | 333 ----------------------------------------- plc.d/crond | 86 ----------- guest.init => plc.init | 0 8 files changed, 3 insertions(+), 804 deletions(-) delete mode 100644 README-devel.txt delete mode 100755 build-chroot.sh delete mode 100755 host.init delete mode 100644 myplc-chroot.spec delete mode 100755 plc.d/crond rename guest.init => plc.init (100%) diff --git a/Makefile b/Makefile index 752e747..3a1b9a2 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ ifeq (,$(PLCSSH)) echo "sync: You must define PLCHOST and GUEST on the command line" echo " e.g. make sync PLCHOST=private.one-lab.org GUEST=myplc01" ; exit 1 else - +$(RSYNC) guest.init $(PLCSSH)/etc/init.d/plc + +$(RSYNC) plc.init $(PLCSSH)/etc/init.d/plc +$(RSYNC) $(BINARIES) $(PLCSSH)/usr/bin +$(RSYNC) $(INITS) $(PLCSSH)/etc/plc.d +$(RSYNC) plc_config.py $(PLCSSH)/usr/lib/python2.4/site-packages/plc_config.py diff --git a/README-devel.txt b/README-devel.txt deleted file mode 100644 index ad93523..0000000 --- a/README-devel.txt +++ /dev/null @@ -1,11 +0,0 @@ -Thierry Parmentelat, on November 30 2007 -we do not support myplc-devel anymore, see build/ for how to build the system in a vserver-based environment - -I am removing all files related to the former myplc-devel, they can be -retrieved in revision 7249: - -D plc_devel_config.xml -D build_devel.sh -D myplc-devel-native.spec -D myplc-devel.spec -D plc-devel.sysconfig diff --git a/build-chroot.sh b/build-chroot.sh deleted file mode 100755 index 36402e2..0000000 --- a/build-chroot.sh +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/bash -# -# Builds MyPLC in the current host environment -# This is for the so-called chroot installation mode, meaning that -# the resulting rpm will install a full chroot image in /plc/root -# that can be run through chroot /plc/root -# This chroot mode is to be opposed to the native mode (see build-native.sh) -# that can be used in the host's root context or within a vserver -# -# root.img (loopback image) -# root/ (mount point) -# data/ (various data files) -# data/etc/planetlab/ (configuration files) -# data/root (root's homedir) -# -# Mark Huang -# Copyright (C) 2006 The Trustees of Princeton University -# -# $Id$ -# - -. build.functions - -# pldistro expected as $1 - defaults to planetlab -pldistro=$1 ; shift - -# These directories are allowed to grow to unspecified size, so they -# are stored as symlinks to the /data partition. mkfedora and yum -# expect some of them to be real directories, however. -datadirs=( -/etc/planetlab -/root -/var/lib/pgsql -/var/www/html/alpina-logs -/var/www/html/boot -/var/www/html/download -/var/www/html/download-${pldistro}-${pl_DISTRO_ARCH} -/var/www/html/files -/var/www/html/sites -/var/www/html/generated -/var/www/html/install-rpms -/var/www/html/xml -/tmp -/usr/tmp -/var/tmp -/var/log -) - -pl_fixdirs root "${datadirs[@]}" - -echo "* myplc: Installing base filesystem" -mkdir -p root data - -pl_root_makedevs root -pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} myplc-chroot.pkgs) -pl_root_mkfedora root $pldistro $pkgsfile -pl_root_tune_image root - -# Install configuration scripts -echo "* myplc: Installing configuration scripts" -install -D -m 755 plc_config.py root/tmp/plc_config.py -chroot root sh -c 'cd /tmp; python plc_config.py build; python plc_config.py install' -install -D -m 755 plc-config root/usr/bin/plc-config -install -D -m 755 plc-config-tty root/usr/bin/plc-config-tty -install -D -m 755 db-config root/usr/bin/db-config -install -D -m 755 dns-config root/usr/bin/dns-config -install -D -m 755 plc-map.py root/usr/bin/plc-map.py -install -D -m 755 plc-kml.py root/usr/bin/plc-kml.py -install -D -m 755 refresh-peer.py root/usr/bin/refresh-peer.py -install -D -m 755 clean-empty-dirs.py root/usr/bin/clean-empty-dirs.py -install -D -m 755 mtail.py root/usr/bin/mtail.py -install -D -m 755 check-ssl-peering.py root/usr/bin/check-ssl-peering.py -# Extra scripts (mostly for mail and dns) not installed by myplc by default. Used in production -mkdir root/etc/support-scripts -cp support-scripts/* root/etc/support-scripts -# copy initscripts to etc/plc_sliceinitscripts -mkdir root/etc/plc_sliceinitscripts -cp plc_sliceinitscripts/* root/etc/plc_sliceinitscripts - -# Install initscripts -echo "* myplc: Installing initscripts" -find plc.d | cpio -p -d -u root/etc/ -install -D -m 755 guest.init root/etc/init.d/plc -chroot root sh -c 'chkconfig --add plc; chkconfig plc on' - -# fetch the release stamp from the build if any -# I could not come up with any more sensitive scheme -if [ -f ../../../myplc-release ] ; then - cp ../../../myplc-release myplc-release -else - echo "Cannot find release information." > myplc-release - date >> myplc-release - echo "$HeadURL$" >> myplc-release -fi -# install it in /etc/myplc-release -install -m 444 myplc-release root/etc/myplc-release - -### Thierry Parmentelat - april 16 2007 -# fix the yum.conf as produced by mkfedora -# so we can use the build's fc4 mirror for various installs/upgrades -# within the chroot jail -# yum_conf_to_build_host is defined in build.functions -yum_conf_to_build_host ../build > root/etc/yum.conf - -### Thierry Parmentelat - may 8 2008 -# no doc built in this old-fashioned packaging anymore -# use myplc-docs instead - -# Install configuration file -echo "* myplc: Installing configuration file" -install -D -m 444 default_config.xml data/etc/planetlab/default_config.xml -install -D -m 444 plc_config.dtd data/etc/planetlab/plc_config.dtd - -# handle root's homedir and tweak root prompt -echo "* myplc: root's homedir and prompt" -roothome=data/root -mkdir -p $roothome -cat << EOF > $roothome/.profile -export PS1=" \$PS1" -EOF -chmod 644 $roothome/.profile - -# Move "data" directories out of the installation -echo "* myplc: Moving data directories out of the installation" -pl_move_dirs root data /data "${datadirs[@]}" - -# Fix permissions on tmp directories -pl_fixtmp_permissions data - -# Remove generated bootmanager script -rm -f data/var/www/html/boot/bootmanager.sh - -# yumgroups.xml and yum repo : let noderepo handle that - -# Make image out of directory -echo "* myplc: Building loopback image" -pl_make_image root root.img 100000000 - -exit 0 diff --git a/build.sh b/build.sh index 8ac4f25..0202fdc 100755 --- a/build.sh +++ b/build.sh @@ -46,8 +46,8 @@ cp plc_sliceinitscripts/* ${RPM_BUILD_ROOT}/etc/plc_sliceinitscripts # Install initscripts echo "* myplc-native: Installing initscripts" -find plc.d | cpio -p -d -u ${RPM_BUILD_ROOT}/etc/ -install -D -m 755 guest.init ${RPM_BUILD_ROOT}/etc/init.d/plc +find plc.d | grep -v crond | cpio -p -d -u ${RPM_BUILD_ROOT}/etc/ +install -D -m 755 plc.init ${RPM_BUILD_ROOT}/etc/init.d/plc # Install configuration file echo "* myplc: Installing configuration file" diff --git a/host.init b/host.init deleted file mode 100755 index 63dd1d6..0000000 --- a/host.init +++ /dev/null @@ -1,232 +0,0 @@ -#!/bin/bash -# -# plc Manages all PLC services on this machine -# -# chkconfig: 2345 99 5 -# -# description: Manages all PLC services on this machine -# -# $Id$ -# - -PATH=/sbin:/bin:/usr/bin:/usr/sbin - -# Source function library. -if [ -f /etc/init.d/functions ] ; then - . /etc/init.d/functions -fi - -# If success() or failure() are not defined -if ! type -type success >/dev/null || ! type -type failure >/dev/null ; then - success() { - echo -ne "[ OK ]\r" - return 0 - } - failure() { - echo -ne "[FAILED]\r" - return 1 - } -fi - -# Source configuration -SERVICE=$(basename $0) -if [ ! -f /etc/sysconfig/$SERVICE ] ; then - SERVICE=plc -fi -if [ -f /etc/sysconfig/$SERVICE -a -z "${PLC_ROOT}${PLC_DATA}" ] ; then - . /etc/sysconfig/$SERVICE -fi - -# Total number of errors -ERRORS=0 - -# Count the exit status of the last command -check () -{ - ERRORS=$(($ERRORS+$?)) -} - -mounted () -{ - if cut -d' ' -f2 /proc/mounts | grep -q "$1" ; then - return 0 - else - return 1 - fi -} - -mount_plc () -{ - echo -n $"Mounting PLC: " - - if ! mounted $PLC_ROOT ; then - if ! e2fsck -a $PLC_ROOT.img | logger -t "PLC" ; then - e2fsck $PLC_ROOT.img - fi - mount -o loop $PLC_ROOT.img $PLC_ROOT - check - fi - if ! mounted $PLC_ROOT/data ; then - mount -t none -o bind,rw $PLC_DATA $PLC_ROOT/data - check - fi - if ! mounted $PLC_ROOT/proc ; then - mount -t proc none $PLC_ROOT/proc - check - fi - - [ $ERRORS -eq 0 ] && success $"PLC unmount" || failure $"PLC unmount" - echo - -} - -start () -{ - # Starting everything - if [ -z "$1" ] ; then - mount_plc - fi - - chroot $PLC_ROOT /sbin/service plc $PLC_OPTIONS start $* - check -} - -umount_plc () -{ - echo -n $"Unmounting PLC: " - - for dir in $PLC_ROOT/proc $PLC_ROOT/data $PLC_ROOT ; do - if mounted $dir ; then - umount $dir - check - fi - done - - [ $ERRORS -eq 0 ] && success $"PLC unmount" || failure $"PLC unmount" - echo -} - -stop () -{ - if mounted $PLC_ROOT ; then - chroot $PLC_ROOT /sbin/service plc $PLC_OPTIONS stop $* - check - fi - - # Stopped everything - if [ -z "$1" ] ; then - umount_plc - fi -} - -mountstatus_plc () -{ - for dir in $PLC_ROOT/proc $PLC_ROOT/data $PLC_ROOT ; do - if mounted $dir ; then - echo $dir - fi - done -} - -# safestop : tries to stop normally; if that fails, kills processes that are still using /plc -# needs the lsof rpm in the root context (should be a dependency of the myplc spec) -function check_command () -{ - command=$1; shift - found=$(type -p $command) - if [ -z "$found" ] ; then - echo "$COMMAND : requires command $command, was not found - exiting" - exit 1 - fi -} - - -### when process stil use /plc/root, we cannot umount it -function kill_all () -{ - [ -n "$DEBUG" ] && set -x - check_command lsof - - echo -n "Killing processes using $PLC_ROOT and $PLC_DATA: " - # initialize process list - former_process_list="unlikely" - - # we ignore unknown uids for now, since we run in the chroot jail anyway - # not too sure about that though, - while true; do - # get the list of processes - collapse and remove empty lines - process_list=$(lsof -t +D $PLC_ROOT +D $PLC_DATA) - if [ -z "$process_list" ] ; then - # we are done, let's bail out - success "$PLC_ROOT clear" ; echo ; return - fi - if [ "$process_list" = "$former_process_list" ] ; then - # we are stuck, no progress since last time : exit on error - failure "$PLC_ROOT locked" ; echo ; return - fi - # record for next loop - former_process_list="$process_list" - # kill them - kill $process_list - sleep 2 - # check there are dead - for pid in $process_list ; do - ps -o pid $pid &> /dev/null - if [ "$?" = 0 ] ; then - [ -n "$DEBUG" ] && echo "$pid survived kill - forcing kill -9" - kill -9 $pid - fi - done - done -} - -# Get command -shift $(($OPTIND - 1)) -command=$1 - -# Get step(s) -shift 1 - -case "$command" in - start|stop) - $command $* - ;; - - restart) - stop $* - ERRORS=0 - start $* - ;; - - reload) - chroot $PLC_ROOT /sbin/service plc $PLC_OPTIONS reload $* - ;; - - mount|umount|mountstatus) - ${command}_plc - ;; - - kill) - kill_all - ;; - - safestop) - stop - ### Checking : we might need to run kill - mounted=$(mountstatus_plc) - if [ -n "$mounted" ] ; then - echo "Umount failed : killing remaining processes and trying again" - ERRORS=0 - kill_all - ERRORS=0 - stop - fi - ;; - - *) - echo "Usage: $0 {start|stop|restart|reload|mount|umount|mountstatus|kill|safestop}" - RETVAL=1 - ;; -esac - -exit $ERRORS diff --git a/myplc-chroot.spec b/myplc-chroot.spec deleted file mode 100644 index 6de2bf7..0000000 --- a/myplc-chroot.spec +++ /dev/null @@ -1,333 +0,0 @@ -# -# $Id$ -# -%define url $URL$ - -%define name myplc-chroot -%define version 4.3 -%define taglevel 7 - -%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} - -Summary: PlanetLab Central (PLC) Portable Installation -Name: %{name} -Version: %{version} -Release: %{release} -License: PlanetLab -Group: Applications/Systems -Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) - -Requires: tar - -Provides: myplc - -%define debug_package %{nil} - -%description -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 -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. - -%prep -%setup -q - -%build -pushd MyPLC -./build-chroot.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/ - -popd - -%clean -rm -rf $RPM_BUILD_ROOT - -# If run under sudo -if [ -n "$SUDO_USER" ] ; then - # Allow user to delete the build directory - chown -h -R $SUDO_USER . - # Some temporary cdroot files like /var/empty/sshd and - # /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} -fi - -%pre -if [ -x %{_sysconfdir}/init.d/plc ] ; then - %{_sysconfdir}/init.d/plc safestop -fi - -# Old versions of myplc used to ship with a bootstrapped database and -# /etc/planetlab directory. Including generated files in the manifest -# was dangerous; if /plc/data/var/lib/pgsql/data/base/1/16676 changed -# names from one RPM build to another, it would be rpmsaved and thus -# effectively deleted. Now we do not include these files in the -# manifest. However, to avoid deleting these files in the process of -# upgrading from one of these old versions of myplc, we must back up -# the database and /etc/planetlab and restore them after the old -# version has been uninstalled in %triggerpostun (also in %post, in -# case we are force upgrading to the same version). -# -# This code can be removed once all myplc-0.4-1 installations have -# been upgraded to at least myplc-0.4-2. - -# 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 - - - # 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} - fi - done -fi - -%post -if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig --add plc - /sbin/chkconfig plc on -fi - -%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 - fi - fi - done -fi - -%preun -# 0 = erase, 1 = upgrade -if [ $1 -eq 0 ] ; then - %{_sysconfdir}/init.d/plc safestop - if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig plc off - /sbin/chkconfig --del plc - fi -fi - -%files -%defattr(-,root,root,-) -# Host startup script and configuration file -%{_sysconfdir}/init.d/plc -%{_sysconfdir}/sysconfig/plc - -# Symlink to /etc/planetlab within data directory -%{_sysconfdir}/planetlab - -# Root filesystem -/plc/root.img -/plc/root - -# Data directory -%dir /plc/data -%config(noreplace) /plc/data/* - -%changelog -* 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 - -* 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) -- doc: reviewed myplc doc - deprecated everything related to myplc-devel -- doc: packaging doc in myplc-native (myplc&PLCAPI) & removed target files from svn -- make sync now works towards vserver-based myplc only - -* Mon May 05 2008 Stephen Soltesz - MyPLC-4.2-9 -- -- added vsys 'pfmount' script to the default netflow slice attributes. -- - -* Thu Apr 24 2008 Thierry Parmentelat - MyPLC-4.2-8 -- plc.d/bootcd step altered for handling legacy bootcd smooth migration -- to new bootcd packaging - -* Wed Apr 23 2008 Thierry Parmentelat - MyPLC-4.2-7 -- changes needed for bootcd 4.2 : new, possible multiple, installation locations, and new rpm name - -* Tue Apr 22 2008 Thierry Parmentelat - MyPLC-4.2-6 -- packaging of mplc-release in myplc-native -- sudoers.php is new to PlanetLabConf (needs nodeconfig-4.2-4) -- resolv file in /etc/resolv.conf, not plc_resolv.conf -- improved sirius script -- remove the 'driver' node-network-setting that was unused, and new 'Multihome' category -- expires more properly set - -* Mon Apr 07 2008 Stephen Soltesz - MyPLC-4.2-4 MyPLC-4.2-5 -- - -* Wed Mar 26 2008 Thierry Parmentelat - MyPLC-4.2-3 MyPLC-4.2-4 -- renew_reminder script moved to support-scripts/ -- gen-aliases script added in support-scripts/ -- sirius initscript moved to plc_sliceinitscripts (formerly inlined in db-config) -- plc-map script : no javascript for googlemap anymore, see new plc-kml script instead -- nodefamily-aware (creates legacy symlink /var/www/html/install-rpms/planetlab) -- new native slice attributes 'capabilities', 'vsys' and 'codemux' -- new setting 'Mom list address' for sending emails to a separate destination -- starts rsyslogd/syslogd as appropriate -- expects nodeconfig package (former PlanetLabConf/ dir from PLCWWW) -- convenience generation of yum.conf in resulting image based on build/mirroring - -* Thu Feb 14 2008 Thierry Parmentelat - myplc-4.2-2 myplc-4.2-3 -- refresh-peer.py removed (duplicate with PLCAPI) -- plc.d/ scripts cleaned up -- 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. - - -%define module_current_branch 4.2 diff --git a/plc.d/crond b/plc.d/crond deleted file mode 100755 index c4275c8..0000000 --- a/plc.d/crond +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# -# priority: 900 -# -# Configure cron jobs -# -# Mark Huang -# Copyright (C) 2006 The Trustees of Princeton University -# -# $Id$ -# - -# Source function library and configuration -. /etc/plc.d/functions -. /etc/planetlab/plc_config - -# Be verbose -set -x - -# Export so that we do not have to specify -p to psql invocations -export PGPORT=$PLC_DB_PORT - -case "$1" in - start) - MESSAGE=$"Starting crond" - dialog "$MESSAGE" - - if [ "$PLC_MAIL_ENABLED" = "1" ] ; then - MAILTO=$PLC_MAIL_SUPPORT_ADDRESS - else - MAILTO= - fi - - cat >/etc/cron.d/plc.cron <>/etc/cron.d/plc.cron - wget -O - -q http://localhost/cron.php - check - fi - - if [ "$PLC_DNS_ENABLED" = "1" ] ; then - echo "*/15 * * * * root dns-config" >>/etc/cron.d/plc.cron - dns-config - check - fi - - if [ "$PLC_DB_ENABLED" = "1" ] ; then - echo "5 5 * * * root vacuumdb -U postgres --all --analyze --quiet --full" >>/etc/cron.d/plc.cron - vacuumdb -U postgres --all --analyze --quiet - check - fi - - if [ "$PLC_WWW_ENABLED" = "1" ] ; then - echo "*/15 * * * * root clean-empty-dirs.py /var/tmp/bootmedium" >> /etc/cron.d/plc.cron - clean-empty-dirs.py /var/tmp/bootmedium - check - fi - - plc_daemon crond - check - - result "$MESSAGE" - ;; - - stop) - MESSAGE=$"Stopping crond" - dialog "$MESSAGE" - - killproc plc_crond - check - - result "$MESSAGE" - ;; -esac - -exit $ERRORS diff --git a/guest.init b/plc.init similarity index 100% rename from guest.init rename to plc.init -- 2.47.0