X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=blobdiff_plain;f=myplc-docs.spec;h=acd8e5c0b0b00dc971b50e28700f46f2663dbb75;hp=c8514320fb171e9c69c9769472e2ba38f512e762;hb=HEAD;hpb=e31ec65eb24d6ae153343cb2a91969fb70659f71 diff --git a/myplc-docs.spec b/myplc-docs.spec index c851432..acd8e5c 100644 --- a/myplc-docs.spec +++ b/myplc-docs.spec @@ -1,11 +1,6 @@ -# -# $Id: myplc-native.spec 9260 2008-05-07 16:20:25Z thierry $ -# -%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/myplc-native.spec $ - %define name myplc-docs -%define version 5.0 -%define taglevel 0 +%define version 5.3 +%define taglevel 5 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -22,16 +17,17 @@ BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} BuildRequires: docbook-dtds, docbook-utils-pdf %define debug_package %{nil} -%description -This package contains the online documentation for MyPLC. This covers -the overall system itself, together with the reference manuals for the -two APIs provided, namely PLCAPI and NMAPI. +%description +This package contains the online documentation for MyPLC, i.e. the +reference manuals for the two APIs provided: PLCAPI and NMAPI. A +more general introduction to the MyPLC system can be found at +http://svn.planet-lab.org/wiki/MyPLCUserGuide %prep %setup -q @@ -39,49 +35,58 @@ two APIs provided, namely PLCAPI and NMAPI. %build rm -rf $RPM_BUILD_ROOT -pushd MyPLC -# beware that making the pdf file somehow overwrites the html -make -C doc myplc.pdf -rm -f doc/myplc.html -make -C doc myplc.html -popd +# using the new lowercase names, and handling legacy +[ -d myplc ] || ln -s MyPLC myplc +[ -d plcapi ] || ln -s PLCAPI plcapi +[ -d nodemanager ] || ln -s NodeManager nodemanager +[ -d monitor ] || ln -s Monitor monitor -pushd PLCAPI +pushd plcapi +# june2011 & f12, latex issues weird warnings, might need to try twice +make -C doc PLCAPI.pdf || make -C doc PLCAPI.pdf # beware that making the pdf file somehow overwrites the html -make -C doc PLCAPI.pdf rm -f doc/PLCAPI.html -make -C doc PLCAPI.html +make -C doc PLCAPI.html || make -C doc PLCAPI.html popd -pushd NodeManager +pushd nodemanager # beware that making the pdf file somehow overwrites the html -make -C doc NMAPI.pdf +make -C doc NMAPI.pdf || make -C doc NMAPI.pdf rm -f doc/NMAPI.html -make -C doc NMAPI.html +make -C doc NMAPI.html || make -C doc NMAPI.html +popd + +# not everyone rebuilds monitor, so make it optional +if [ -d monitor ] ; then +pushd monitor +# beware that making the pdf file somehow overwrites the html +make -C docs Monitor.pdf || make -C docs Monitor.pdf +rm -f docs/Monitor.html +make -C docs Monitor.html || make -C docs Monitor.html popd +fi %install for ext in pdf html; do - install -D -m 444 MyPLC/doc/myplc.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/myplc.$ext - install -D -m 444 PLCAPI/doc/PLCAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.$ext - install -D -m 444 NodeManager/doc/NMAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.$ext -done - -# myplc figures -for ext in eps png; do - install -m 444 MyPLC/doc/architecture.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/architecture.$ext + install -D -m 444 plcapi/doc/PLCAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.$ext + install -D -m 444 nodemanager/doc/NMAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.$ext + if [ -d monitor ] ; then + install -D -m 444 monitor/docs/Monitor.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.$ext + fi done -./MyPLC/doc/docbook2drupal.sh "MyPLC Documentation (%{pldistro})" \ - $RPM_BUILD_ROOT/var/www/html/planetlab/doc/myplc.html \ - $RPM_BUILD_ROOT/var/www/html/planetlab/doc/myplc.php -./MyPLC/doc/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \ +./myplc/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.html \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.php -./MyPLC/doc/docbook2drupal.sh "Node Manager API Documentation (%{pldistro})" \ +./myplc/docbook2drupal.sh "Node Manager API Documentation (%{pldistro})" \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.html \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.php +if [ -d monitor ] ; then +./myplc/docbook2drupal.sh "Monitor API Documentation (%{pldistro})" \ + $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.html \ + $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.php +fi %clean rm -rf $RPM_BUILD_ROOT @@ -91,6 +96,305 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/planetlab/doc/ %changelog +* Mon Jan 07 2019 Thierry Parmentelat - myplc-5.3-5 +- last version suitable for f27/f29 with python2 +- packaging is split up, one more rpm named 'myplc-core' is produced, +- that covers the infrastructure side only (without bootcds and nodeimages and all node-oriented material) +- no more init file, one systemd service only, that leverages new /usr/bin/plc-ctl +- more robust config for httpd and php-fpm and php + +* Sun Jul 16 2017 Thierry Parmentelat - myplc-5.3-4 +- takes care of creating plcapi log file + +* Wed Feb 18 2015 Thierry Parmentelat - myplc-5.3-3 +- tweaked renew_reminder for federation + +* Fri Mar 21 2014 Thierry Parmentelat - myplc-5.3-2 +- tweaks in check-hrns.py +- do not require PyXML any more + +* Tue Dec 10 2013 Thierry Parmentelat - myplc-5.3-1 +- review check-hrns for plcapi-5.3 +- add PLC_HRN_ROOT in usual plc-config-tty's settings + +* Thu Oct 10 2013 Thierry Parmentelat - myplc-5.2-5 +- reduce the scope of check-hrns.py script, now that the SFA layer handles this natively +- add an rpm-sign dependency on feedora>=16 + +* Fri Jun 28 2013 Thierry Parmentelat - myplc-5.2-4 +- drop PLC_OMF_XMPP_{USER,PASSWORD} from config + +* Tue Apr 23 2013 Thierry Parmentelat - myplc-5.2-3 +- plc.d/gpg now does not rm /dev/random but preserves it +- this is because libvirt won't let us run mknod + +* Wed Apr 10 2013 Thierry Parmentelat - myplc-5.2-2 +- fix typo in check-hrns - used to print 'host' while dealing with persons + +* Thu Mar 07 2013 Thierry Parmentelat - myplc-5.2-1 +- supports httpd config for either mod_python (preferred) or mod_wsgi +- requires mod_wsgi on f18 only, otherwise mod_python +- supports httpd config for apache 2.4 (f18) +- new config variable PLC_FLAVOUR_VIRT_MAP to set 'virt' from fcdistro + +* Wed Dec 19 2012 Thierry Parmentelat - myplc-5.1-6 +- bugfix in check-vsys-defaults.py + +* Wed Dec 19 2012 Thierry Parmentelat - myplc-5.1-5 +- define open_basedir in php.ini to stop confidentiality leak +- new utility slice_ssh_keys.py for showing sliver keys (OMF interop) +- new config setting PLC_VSYS_DEFAULTS for vsys tags granted to all +- new utilities check-hrns.py and check-vsys-defaults.py + +* Fri Aug 31 2012 Thierry Parmentelat - myplc-5.1-4 +- set TimeoutSec to 300 in plc.service +- remove ref to deprecated svn $URL$ in db-config usage + +* Mon Jul 09 2012 Thierry Parmentelat - myplc-5.1-3 +- expose mtail.py as simply mtail + +* Mon May 07 2012 Thierry Parmentelat - myplc-5.1-2 +- plc-kml.py now has support for nodegroups + +* Mon Apr 16 2012 Thierry Parmentelat - myplc-5.1-1 +- use nodeimage package instead of deprecated bootstrapfs +- has systemd-friendly startup script +- plc_reload moved to functions/ - no more service plc reload +- no svn keywords anymore + +* Mon Sep 26 2011 Thierry Parmentelat - myplc-5.0-19 +- new maintenance/monitoring script spot-aliens to look for glitches in refreshpeer+sfa + +* Tue Jun 07 2011 Thierry Parmentelat - myplc-5.0-18 +- new settings for myslice (comon&tophat) and monitor (db) +- removed mentions of chroot in description +- can redo myplc-docs on broken f12-latex +- set short_open_tag in php.ini +- fixes in gen-sites-xml (is that still used ?) +- partial-repo.sh has moved to 'build' where it more belongs +- tweaks in convenience tool 'mtail' + +* Tue Mar 22 2011 Thierry Parmentelat - myplc-5.0-17 +- fixed changelog, no change from 5.0-16 + +* Mon Mar 21 2011 Thierry Parmentelat - myplc-5.0-16 +- requires ed for the plc.d/packages step +- sirius initscript to handle stop and restart + +* Fri Feb 04 2011 Thierry Parmentelat - myplc-5.0-15 +- ignore steps in db-config.d if they have a '.' or '~' in their name + +* Wed Jan 26 2011 Thierry Parmentelat - myplc-5.0-14 +- can redo myplc-docs without the doc for monitor + +* Mon Jan 24 2011 Thierry Parmentelat - myplc-5.0-13 +- no semantic change - just fixed specfile for git URL + +* Wed Dec 01 2010 Thierry Parmentelat - myplc-5.0-12 +- needed for plcapi-5.0-19, i.e. tag permissions based on roles + +* Mon Oct 04 2010 Baris Metin - myplc-5.0-11 +- add missing files to rpm package + +* Mon Oct 04 2010 Thierry Parmentelat - myplc-5.0-10 +- mtail.py -s for SFA +- spot-aliesm.py is a utility script for sanity checks of the PLC db when running refreshpeer+sfa + +* Thu Jul 15 2010 Thierry Parmentelat - myplc-5.0-9 +- avoid duplication of the plc-config binary in both myplc and myplc-config rpms + +* Mon Jul 12 2010 Thierry Parmentelat - myplc-5.0-8 +- plc-config-tty now has a validator on booleans +- e.g. entering 'True' now is rejected rather than silently recording 'false' + +* Tue Jul 06 2010 Baris Metin - MyPLC-5.0-7 +- disable mod_wsgi + +* Mon Jul 05 2010 Baris Metin - MyPLC-5.0-6 +- module name changes +- start wsgi support + +* Tue Jun 22 2010 Thierry Parmentelat - MyPLC-5.0-5 +- new setting PLC_RESERVATION_GRANULARITY + +* Wed May 12 2010 Talip Baris Metin - MyPLC-5.0-4 +- * partial-repo.sh script +- * preserve key along with certificates + +* Fri Apr 02 2010 Thierry Parmentelat - MyPLC-5.0-3 +- set date.timezone to GMT if not set in php.ini for php-5.3 / fedora12 + +* Fri Mar 12 2010 Thierry Parmentelat - MyPLC-5.0-2 +- legacy scripts gen-sites-xml & gen-static-content back in (sigh) +- new OMF category in the config +- create the drl system slice + +* Fri Jan 29 2010 Thierry Parmentelat - MyPLC-5.0-1 +- first working version of 5.0: +- pld.c/, db-config.d/ and nodeconfig/ scripts should now sit in the module they belong to +- nodefamily is 3-fold with pldistro-fcdistro-arch +- new PLC_FLAVOUR config category +- reviewed module layout +- cleaned up old chroot-related build stuff (does not need the build module when building anymore) + +* Sat Jan 09 2010 Thierry Parmentelat - MyPLC-4.3-37 +- support for fedora 12 +- new package myplc-config for use by sfa +- drupal user registration turned off + +* Thu Dec 31 2009 Marc Fiuczynski - MyPLC-4.3-36 +- - fix to make sure when API, BOOT, MONITOR are on the same +- machine as WWW that the SSL key,cert for WWW takes precedence. +- - Do proper setup for SSL CA certficate to be used as the server +- chain. + +* Wed Dec 23 2009 Marc Fiuczynski - MyPLC-4.3-35 +- - Change sysctl.conf source to be PlanetLabConfsysctl.con rather than the php script. + +* Tue Dec 22 2009 Baris Metin - MyPLC-4.3-34 +- depend on pcucontrol + +* Fri Dec 18 2009 Baris Metin - MyPLC-4.3-33 +- * validate input according to type in plc_config +- * added the _genicw system slice +- * add tag types for sites and persons +- * add new tags for nodes and slices for exemption from myops + +* Thu Nov 26 2009 Thierry Parmentelat - MyPLC-4.3-32 +- turn off drupal on a box that acts as BOOT server but not as WWW server +- cleanup some obsolete code for old chroot-jail packaging in the process +- new bootcd-kernel script for keeping bootcd variants up2date + +* Mon Nov 09 2009 Daniel Hokka Zakrisson - MyPLC-4.3-31 +- Make the /etc/hosts manipulation optional. + +* Thu Nov 05 2009 Daniel Hokka Zakrisson - MyPLC-4.3-30 +- Fix SetRole. + +* Tue Nov 03 2009 Marc Fiuczynski - MyPLC-4.3-29 +- - Added "SetRole()" so that db-config.d/ scriplets can insert roles +- into the DB. +- - Added the root ssh key handling support back into plc.d/ssh and the +- default xml file. This should be identical to the way it was in +- rc12. +- - Added support in the db-config.d/01-init script to register the root +- ssh public key with the default administrator. In this way the root +- ssh key will make it into the root account on the nodes by means of +- NodeManager's specialaccounts plugin. + +* Tue Oct 20 2009 Thierry Parmentelat - MyPLC-4.3-28 +- db-config ignores sliver tags +- sirius's db-config script renamed (was sirious) + +* Tue Oct 13 2009 Thierry Parmentelat - MyPLC-4.3-27 +- fix for silverauth - missing tag types now created at plc startup time + +* Fri Oct 09 2009 Thierry Parmentelat - MyPLC-4.3-26 +- plc.d/ssl preserves SSL certificates when it thinkfs they're obsolete + +* Wed Oct 07 2009 Thierry Parmentelat - MyPLC-4.3-25 +- companion to NM's specialaccounts plugin +- do not generate /etc/planetlab/root_ssh_key* anymore +- remove related config. variables and conf_files + +* Sun Sep 20 2009 Stephen Soltesz - MyPLC-4.3-24 +- clarified description text to refer only to plcrt and not other optional +- packages. + +* Sat Sep 19 2009 Stephen Soltesz - MyPLC-4.3-23 +- fixed a bug setting slice multiple attributes with the same tag name + +* Mon Sep 07 2009 Thierry Parmentelat - MyPLC-4.3-22 +- SSL setup for monitor box, and related new config variables +- new conf_file for /etc/planetlab/extensions +- various tweaks in db-config internals, about initscripts among others +- also more messages defined in the db + +* Tue Jul 07 2009 Thierry Parmentelat - MyPLC-4.3-21 +- create node tags, like e.g. 'arch', that were not handled with 4.3-20 + +* Tue Jul 07 2009 Thierry Parmentelat - MyPLC-4.3-20 +- bugfix in db-config, tag 4.3-19 would not fly + +* Mon Jul 06 2009 Marc Fiuczynski - MyPLC-4.3-19 +- Refactored db-config into snippets in db-config.d/. + +* Thu Jul 02 2009 Thierry Parmentelat - MyPLC-4.3-18 +- oops, tag 4.3-17 was broken and would not work + +* Wed Jul 01 2009 Thierry Parmentelat - MyPLC-4.3-17 +- bugfix - escape sequences inserted in xml configs + +* Fri Jun 26 2009 Marc Fiuczynski - MyPLC-4.3-16 +- Handle db-config.d files properly. + +* Tue Jun 23 2009 Marc Fiuczynski - MyPLC-4.3-15 +- - Fix /etc/init.d/plc to have command usage show up on the tty rather +- than the log file +- - Fix db-config to be a bit more cautious when +- /etc/planetlab/db-config.d doesn't exist +- - Clean up db-config approach to ignore .bak, *~, .rpm{save,new}, and +- .orig files. +- - Refactor generic plc-config-tty code into plc_config.py. +- plc-config-tty now contains MyPLC specific paths, "usual" variables, +- and the list of validated variables and the corresponding +- validator() function. This refactoring lets one reuse plc_config.py +- as a generic cmdline configuration tool for highly customer MyPLC +- like software. + +* Mon Jun 15 2009 Stephen Soltesz - MyPLC-4.3-14 +- update PCU Type descriptions. +- updates to init scripts + +* Wed Jun 03 2009 Thierry Parmentelat - MyPLC-4.3-13 +- requires monitor-pcucontrol so register-wizard can work + +* Tue May 26 2009 Thierry Parmentelat - MyPLC-4.3-12 +- cleaned up plc-config-tty, no more need to configure plc-devel + +* Tue May 19 2009 Thierry Parmentelat - MyPLC-4.3-11 +- first draft of plc-orpha-accounts.py, and rename check-ssl-peering into plc-<> + +* Fri May 15 2009 Thierry Parmentelat - MyPLC-4.3-10 +- tighter right permissions on site_admin's authorized keys for more robustness + +* Wed May 06 2009 Thierry Parmentelat - MyPLC-4.3-9 +- fix issue in db-config that prevented correct operation + +* 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. @@ -111,4 +415,4 @@ rm -rf $RPM_BUILD_ROOT - cosmetic change in kml output -%define module_current_branch 4.2 +%define module_current_branch 4.3