X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=blobdiff_plain;f=plewww.spec;h=42ab0e90a06d525cd2637d1103afd6318ea7f440;hp=367572534ff4a8babedb914af4be77f24b604249;hb=72ad9350221d3a24f322acb9fda8113b4c82f8c5;hpb=cce8dc1d3de633a35e2212b23010aad080ca744b diff --git a/plewww.spec b/plewww.spec index 3675725..42ab0e9 100644 --- a/plewww.spec +++ b/plewww.spec @@ -1,11 +1,7 @@ -# -# $Id$ -# - # what the myplc rpm requires %define name plewww %define version 4.3 -%define taglevel 8 +%define taglevel 71 # no need to mention pldistro as this module differs in both distros #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -20,11 +16,12 @@ Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch +BuildRequires: python Vendor: OneLab Packager: OneLab Distribution: PlanetLab %{version} -URL: http://svn.one-lab.org/svn/new_plc_www/ +URL: %{SCMURL} # We use set everywhere #Requires: httpd >= 2.0 @@ -57,8 +54,8 @@ This subset of the plewww package has general purpose features for the benefit o %setup -q %build -echo "There is no build stage for this component" -echo "All files just need to be installed as is from the codebase" +echo "Compressing javascript files" +make compress %install rm -rf $RPM_BUILD_ROOT @@ -71,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT echo "* PLEWWW: Installing web pages" mkdir -p $RPM_BUILD_ROOT/var/www/html # exclude codebase just in case -rsync -a --exclude Makefile --exclude httpd --exclude \*.spec --exclude .svn ./ $RPM_BUILD_ROOT/var/www/html/ +rsync -a --exclude jsmin.py --exclude Makefile --exclude httpd --exclude \*.spec --exclude .svn ./ $RPM_BUILD_ROOT/var/www/html/ echo "* PLEWWW: Installing conf files for httpd" mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d @@ -102,11 +99,16 @@ fi popd # hack the welcome page for MyPLC pushd /var/www/html/modules -if [ ! -f node.module.drupal ] ; then - cp node.module node.module.drupal - [ -f /var/www/html/drupal-hacks/node.module ] && cp -f /var/www/html/drupal-hacks/node.module /var/www/html/modules/node.module -fi +for module in user node; do + # backup only once + [ -f ${module}.module.drupal ] || cp ${module}.module ${module}.module.drupal + # always update so a change in our file can make through + cp -f /var/www/html/drupal-hacks/${module}.module /var/www/html/modules/${module}.module +done popd +# create myslice.log and change its ownership +touch /var/log/myslice.log +chown apache:apache /var/log/myslice.log %clean rm -rf $RPM_BUILD_ROOT @@ -123,6 +125,261 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/plekit %changelog +* Mon Apr 16 2012 Thierry Parmentelat - plewww-4.3-71 +- no change, just make sync for lxc-hosted tests + +* Fri Feb 24 2012 Thierry Parmentelat - plewww-4.3-70 +- refactoring for tophat/columns +- should take care of the irritating warning message about columns + +* Mon Nov 28 2011 Thierry Parmentelat - plewww-4.3-69 +- do not display the 'node' role when confusing + +* Mon Nov 07 2011 Thierry Parmentelat - plewww-4.3-68 +- support for setting nodes as reservable +- rely more on previous state when deciding to open or not toggles in a view +- remove statements for setting maximum memory usage, that sometimes + +* Mon Sep 26 2011 Thierry Parmentelat - plewww-4.3-67 +- node page can edit interfaces even when no interface + +* Wed Aug 31 2011 Thierry Parmentelat - plewww-4.3-66 +- uses a 2-week (!) session + +* Mon Jun 06 2011 Thierry Parmentelat - plewww-4.3-65 +- minor/cosmetic fixes in the leases area + +* Mon Jun 06 2011 Thierry Parmentelat - plewww-4.3-64 +- new jstorage to store stuff in the browser, start to use that to "remember" the open/closed tabs +- uses MYSLICE_TOPHAT_AVAILABLE and MYSLICE_COMON_AVAILABLE to decide whether to add extra data +- has a feature to 'test' pcu connection +- only admins can add users to different sites. +- remove dep. to outdated _gen_planetflow.php +- rephrased (disabled, or pending registration) +- + various fixes + +* Wed Mar 23 2011 Thierry Parmentelat - plewww-4.3-63 +- fix display glitch exposed with dimes initscript + +* Tue Mar 22 2011 Thierry Parmentelat - plewww-4.3-62 +- rename initscript_body into initscript_code + +* Fri Feb 18 2011 Thierry Parmentelat - plewww-4.3-61 +- bugfix for the reservation interface + +* Thu Feb 17 2011 Thierry Parmentelat - plewww-4.3-60 +- reservation page uses ajax - no need to reload after submit +- reservation dialogs for offset in the future & # slots +- fix the timezone in reservations (actually use php.ini) +- reservation visible (and hardwired) in nodes view +- have pulled prototype 1.7 but not in used yet + +* Thu Feb 03 2011 Thierry Parmentelat - plewww-4.3-59 +- set both 'omf_control' and 'vref' for omf-friendly slices + +* Sun Jan 23 2011 Thierry Parmentelat - plewww-4.3-58 +- display tags in alphabetic order in node view, tags section, the drop down menu + +* Thu Dec 09 2010 Thierry Parmentelat - plewww-4.3-57 +- on-the-fly retrieval of data at comon & tophat (unused so far) +- use accessors to store person's preference of columns +- fix in toggle.js for the '?' button, node table layout tab +- sort actions logging improved + +* Tue Dec 07 2010 Thierry Parmentelat - plewww-4.3-56 +- keep people from disabling or deleting themselves +- cannot become a disabled person +- outline people without a role + +* Wed Dec 01 2010 Thierry Parmentelat - plewww-4.3-55 +- needed for plcapi-5.0-19, i.e. tag permissions based on roles + +* Mon Oct 25 2010 Baris Metin - plewww-4.3-54 +- tagging plewww for a new deployment + +* Fri Oct 15 2010 Thierry Parmentelat - plewww-4.3-53 +- add a 'report a problem' link for the RebootNode button +- new exp page nodes2.php with consistent selectable-columns layout as myslice +- tweaks in the exp. myslice (slices.php) + +* Wed Oct 13 2010 Thierry Parmentelat - plewww-4.3-52 +- new action reboot-node-with-pcu & reboot button on node page (not sure about the status of that though) +- my_slice with adjustable set of columns in slices/slice2.php +- fix for the 'site registration' page + +* Mon Sep 20 2010 Thierry Parmentelat - plewww-4.3-51 +- show message about leases - leases tab first in nodes section +- fix how reservable nodes show up + +* Mon Sep 06 2010 Thierry Parmentelat - plewww-4.3-50 +- cosmetic, rendering of textareas was like password fields + +* Fri Sep 03 2010 Thierry Parmentelat - plewww-4.3-49 +- bugfix in slice page, had wrong (null) expiration date +- upgraded to raphael-1.5.2, don't minimize this lib +- nicer layout for password fields as well +- long tag values in the slice page (ssh keys..) get truncated, plain value show on hovering +- marginally optimized slice page (2 GetNodes call down) +- minimal profiling cap., and usable in the slice page with _GET[profiling]=1 +- _GET[resa_slots] to set number of slots, _GET[resa_offset] to book in the future (in hours) +- reservations can cope with a bit more slots - will need scrolling someday +- omf text has hyperlinks to the tools + +* Wed Sep 01 2010 Thierry Parmentelat - plewww-4.3-48 +- reservation section now effective +- can set omf_control at slice-creation time +- can set node as reservable at node-creation time +- nicer text input fields + various tweaks + +* Tue Jul 06 2010 Baris Metin - plewww-4.3-47 +- show nodegroups form to add new groups + +* Wed Jun 16 2010 Baris Metin - plewww-4.3-46 +- just tagging plewww again to test module-tag on git + +* Tue Jun 15 2010 Baris Metin - PLEWWW-4.3-45 +- encode strings properly in forms. + +* Wed Apr 28 2010 S.Çağlar Onur - PLEWWW-4.3-44 +- Use readfile() function to reduce the memory footprint + +* Fri Apr 02 2010 Thierry Parmentelat - PLEWWW-4.3-43 +- removed all deprecated functions for PHP-5.3 on fedora 12 + +* Tue Mar 16 2010 Talip Baris Metin - PLEWWW-4.3-42 +- * exclude DNS from subnet checking +- * redirect pi's and techs to register wizard. only display 'Insuffieient privs' error to users' +- * allow longer abbreviated names +- * don't let empty strings kill the server (postgresql and apache) + +* Sat Jan 09 2010 Thierry Parmentelat - PLEWWW-4.3-41 +- disable drupal user registration (hard: patching the user module) + +* Wed Dec 16 2009 Baris Metin - PLEWWW-4.3-40 +- * show error messages for update interface +- * 'Add Node' is admin only +- * add site selector for 'Add Node' + +* Thu Nov 26 2009 Thierry Parmentelat - PLEWWW-4.3-39 +- new add-interface page : now has a checkbox for non-primary interfaces to chose between virtual or physical +- this affects the settings of ifname and alias that were formerly set unconditionally +- review the interface-checking javascript code +- changed the interface to plekitform, method is now optional and part of an options hash + +* Tue Nov 17 2009 Thierry Parmentelat - PLEWWW-4.3-38 +- can't use php objects for showing node status, this is too slow +- fix interface add page + +* Mon Nov 16 2009 Thierry Parmentelat - PLEWWW-4.3-37 +- consistency in the way nodes status is displayed in the node and slice areas +- extra tags columns show up on the nodes page as well, tweaked in the process +- roles management in person page fixed + +* Sun Nov 15 2009 Thierry Parmentelat - PLEWWW-4.3-36 +- displaying node tags in the nodes page as well +- table headers now can have a 'title' that shows up when hovering on the column header + +* Sat Nov 14 2009 Thierry Parmentelat - PLEWWW-4.3-35 +- bugfix for the custom sortAlphaNumeric{Bottom,Top} sortable types + +* Fri Nov 13 2009 Thierry Parmentelat - PLEWWW-4.3-34 +- extensible set of columns in the nodes area of the (my)slice page +- nodegroups can be added/deleted/updated +- tags management improved marginally + +* Tue Oct 20 2009 Thierry Parmentelat - PLEWWW-4.3-33 +- fix pending sites page - was getting fooled by ext_consortium_id=None + +* Tue Oct 20 2009 Thierry Parmentelat - PLEWWW-4.3-32 +- resetting tag as something went wrong when setting 31 + +* Wed Oct 07 2009 Thierry Parmentelat - PLEWWW-4.3-30 +- nicer look for slice creation, (public) sites +- users show with all their sites in the persons page + +* Fri Sep 18 2009 Thierry Parmentelat - PLEWWW-4.3-29 +- reviewed registration pages for persons and sites + +* Fri Sep 11 2009 Thierry Parmentelat - PLEWWW-4.3-28 +- increase memory limit in the nodes page + +* Thu Sep 10 2009 Thierry Parmentelat - PLEWWW-4.3-27 +- fixes one typo + +* Mon Sep 07 2009 Thierry Parmentelat - PLEWWW-4.3-26 +- minor/cosmetic + +* Mon Aug 10 2009 Stephen Soltesz - PLEWWW-4.3-25 +- Add default Interface tags to extra interfaces. +- Add clearer 'Add New PCU' link on node page. +- Disable user registration for tech and PI roles. + +* Thu Jul 02 2009 Thierry Parmentelat - PLEWWW-4.3-24 +- new 'controller' instantiation state available in add slice page + +* Thu Jul 02 2009 Baris Metin - PLEWWW-4.3-23 +- exclude datepicler.js from jsmin +- table sort function for Last Contact columns +- drop options for generic boot images + +* Wed Jul 01 2009 Thierry Parmentelat - PLEWWW-4.3-22 +- displays editable mac address for interfaces +- properly sorts bandwidths +- new 'controller' slice instantiation method +- bugfix, division by zero when displaying a just-changed node + +* Tue Jun 16 2009 Thierry Parmentelat - PLEWWW-4.3-21 +- bugfix with linetabs + +* Tue Jun 16 2009 Thierry Parmentelat - PLEWWW-4.3-20 +- fix add interface from the node page + +* Mon Jun 15 2009 Stephen Soltesz - PLEWWW-4.3-19 +- only add users that are enabled and not yet a member of the slice +- fix to plc_peers +- my sites, my nodes, my persons improvements for users with multiple sites +- adds a script to minimize the java script files. + +* Sun Jun 07 2009 Thierry Parmentelat - PLEWWW-4.3-18 +- planetlab module to show 'All My Sites Nodes' link rather than 'My Site Nodes' if several sites + +* Sun Jun 07 2009 Thierry Parmentelat - PLEWWW-4.3-17 +- first draft for pcu-handling features +- lighter contrat for PLE/PLC toggles +- as many 'my site'-like links as the user has sites + +* Wed Jun 03 2009 Thierry Parmentelat - PLEWWW-4.3-16 +- fix for whitelisted nodes +- now links to the node register wizard +- can enable sites +- various other minor fixes, like broken planetlab.module for techs, and login link + +* Sat May 30 2009 Thierry Parmentelat - PLEWWW-4.3-15 +- plekittable knows how to turn off sort-on-load, and the admin users pages do +- + various cosmetic fixes + +* Tue May 26 2009 Thierry Parmentelat - PLEWWW-4.3-14 +- a few minor improvements pushed on PLE + +* Fri May 15 2009 Thierry Parmentelat - PLEWWW-4.3-13 +- fix for sites that were displayed as not public +- improvements to the python interface to sortable tables for monitor + +* Fri May 15 2009 Thierry Parmentelat - PLEWWW-4.3-12 +- various improvements + +* Wed May 06 2009 Thierry Parmentelat - PLEWWW-4.3-11 +- sliver page now correctly shows sliver tags +- support for download-node-usb-partition and various other improvements + +* Tue Apr 28 2009 Thierry Parmentelat - PLEWWW-4.3-10 +- a few tweaks and typos fixed on PLE + +* Tue Apr 21 2009 Thierry Parmentelat - PLEWWW-4.3-9 +- slice_add & node_download dialogs use plekit +- slice_add can add people in the slice +- various improvements after rollout on PLE + * Fri Apr 17 2009 Thierry Parmentelat - PLEWWW-4.3-8 - cosmetic fixes to be in 4.3-rc2 - also a first (unpackaged) draft of the plekit table in python