X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plewww.spec;h=b11d033b249b4edabd5c5b614a265a2f0d17b51b;hb=HEAD;hp=86b2d56206bf6d15f7e09e177ca1d6cc526d532e;hpb=dbd254138321f2208d7d3d6c87b2db1149068a0f;p=plewww.git diff --git a/plewww.spec b/plewww.spec index 86b2d56..973bdc3 100644 --- a/plewww.spec +++ b/plewww.spec @@ -1,10 +1,9 @@ # what the myplc rpm requires %define name plewww -%define version 5.2 -%define taglevel 3 +%define version 5.3 +%define taglevel 1 # no need to mention pldistro as this module differs in both distros -#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define release %{taglevel}%{?date:.%{date}} Summary: PlanetLab Europe (PLC) Web Pages @@ -17,6 +16,8 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: python +# for patching drupal session code +BuildRequires: ed Vendor: OneLab Packager: OneLab @@ -44,7 +45,7 @@ Summary: Utilities used by the plewww pages Group: Applications/Systems %description -The plewww package is made of the web pages that run on top of the +The plewww package is made of the web pages that run on top of the PLCAPI component to provide the Web Interface to MyPLC users. %description plekit @@ -79,16 +80,20 @@ install -D -m 644 httpd/*.conf $RPM_BUILD_ROOT/etc/httpd/conf.d/ drupal_settings_dir=/var/www/html/sites/default if [ ! -d $drupal_settings_dir ] ; then echo "Could not find directory $drupal_settings_dir" - echo "This suggests that you do not have a planetlab-custom drupal installed" + echo "This suggests you do not have a planetlab-custom drupal installed" exit 1 fi pushd $drupal_settings_dir # tune $db_url if [ ! -f settings.php.drupal ] ; then cp settings.php settings.php.drupal - sed -e 's|^[ \t]*\$db_url.*|require_once("plc_config.php");$db_url="pgsql://" . PLC_DB_USER . ":" . PLC_DB_PASSWORD . "@" . PLC_DB_HOST . ":" . PLC_DB_PORT . "/drupal";|' \ - settings.php.drupal > settings.php fi +# always do this; it's idempotent +# hopefully it will help in various upgrade scenarios where +# drupal was re-installed, and settings.php was left in the original drupal state +# which results in the infamous "cannot connect to mysql database" +sed -e 's|^[ \t]*\$db_url.*|require_once("plc_config.php");$db_url="pgsql://" . PLC_DB_USER . ":" . PLC_DB_PASSWORD . "@" . PLC_DB_HOST . ":" . PLC_DB_PORT . "/drupal";|' \ + settings.php.drupal > settings.php popd # append our own database creation hacks to the drupal database schema pushd /var/www/html/database @@ -106,9 +111,14 @@ for module in user node; do cp -f /var/www/html/drupal-hacks/${module}.module /var/www/html/modules/${module}.module done popd +# hack drupal's session handler for php8 +pushd /var/www/html/includes +bash /var/www/html/drupal-hacks/patch-session-inc.sh +popd # create myslice.log and change its ownership -touch /var/log/myslice.log -chown apache:apache /var/log/myslice.log +mkdir -p /var/log/myslice +touch /var/log/myslice/myslice.log +chown apache:apache /var/log/myslice/myslice.log %clean rm -rf $RPM_BUILD_ROOT @@ -125,6 +135,39 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/plekit %changelog +* Fri Nov 22 2025 Thierry Parmentelat - plewww-5.3- +- always patch drupal settings, not just once + hopefully makes various upgrade scenarios more robust +- various cosmetic fixes + +* Sat Apr 30 2022 Thierry Parmentelat - plewww-5.3-0 +- for php8 on fedora35 + +* Wed May 16 2018 Thierry - plewww-5.2-9 +- not too clean patches for r2lab: +- * search for a file named /etc/planetlab/php/person-registration.txt +- that can override the text message for individuals registration +- * do not list sites that have the disabled_registration tag set +- when listing them for individuals registration +- remove omf-friendly checkbox in slice-creation dialog +- comment out {Min,Max}SpareServers settings in httpd config + +* Sun Jul 16 2017 Thierry Parmentelat - plewww-5.2-8 +- a few niceties, thanks to Ciro + +* Sun Jul 10 2016 Thierry Parmentelat - plewww-5.2-7 +- remove utf8_deode as per Thomas's suggestion + +* Fri Jun 26 2015 Thierry Parmentelat - plewww-5.2-6 +- Offer the option to set a node in 'upgrade' mode - like reinstall but leaving slices intact + +* Wed Feb 18 2015 Thierry Parmentelat - plewww-5.2-5 +- tweaks in node_downloads.php about memory size and compression scheme + +* Tue Dec 10 2013 Thierry Parmentelat - plewww-5.2-4 +- googlemap widget: support for gmap api v3 + various cosmetic tweaks +- can display site names with odd characters + * Tue Jun 04 2013 Thierry Parmentelat - plewww-5.2-3 - typo in help message about initscripts