X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=49240b62c7055686082a2b748738e0aa195b43b5;hb=0f82cadd7f6b1d91b739d060310192dab561f655;hp=31766a621800f6df26d156b7416fe414f1d7df72;hpb=1c5b3579ba5e644f5ef58c3f322255a3dedacf3f;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 31766a6..49240b6 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,10 +1,6 @@ -# -# $Id$ -%define url $URL$ - %define name myplc -%define version 5.0 -%define taglevel 1 +%define version 5.3 +%define taglevel 4 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -20,7 +16,7 @@ BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} %define nodefamily %{pldistro}-%{distroname}-%{_arch} @@ -29,6 +25,7 @@ Summary: PlanetLab Central (PLC) Portable Installation Group: Applications/Systems # as much as possible, requires should go in the subpackages specfile +Requires: redhat-lsb Requires: bzip2 Requires: tar Requires: less @@ -41,7 +38,7 @@ Requires: curl Requires: rsync Requires: python-devel Requires: yum -Requires: PyXML +#Requires: PyXML Requires: createrepo Requires: cpio Requires: wget @@ -54,11 +51,17 @@ Requires: vim-minimal Requires: findutils Requires: xmlsec1 Requires: xmlsec1-openssl -%if "%{distro}" == "Fedora" && %{distrorelease} >= 10 +Requires: ed Requires: cronie -%else -Requires: vixie-cron +# starting with f16 we depend on this new rpm +%if "%{distro}" == "Fedora" && %{distrorelease} >= 16 +Requires: rpm-sign %endif +# starting with f27 we depend on this new rpm +%if "%{distro}" == "Fedora" && %{distrorelease} >= 27 +Requires: php-fpm +%endif + # planetlab stuff Requires: bootmanager Requires: bootcd-%{nodefamily} @@ -67,22 +70,30 @@ Requires: PLCWWW Requires: www-register-wizard Requires: nodeconfig Requires: nodeyum -Requires: PLCAPI -Requires: bootstrapfs-%{nodefamily} +Requires: plcapi >= 5.2 +# this technically is a plcapi dependency but it's simpler here for chosing which +%if "%{distro}" == "Fedora" && %{distrorelease} >= 29 +Requires: python2-mod_wsgi +%else +%if "%{distro}" == "Fedora" && %{distrorelease} >= 18 +Requires: mod_wsgi +%else +Requires: mod_python +%endif +Requires: nodeimage-%{nodefamily} Requires: myplc-docs Requires: myplc-release Requires: myplc-config %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. 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. +%description +MyPLC is a complete PlanetLab Central (PLC) portable installation. +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. 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. ####################### myplc-config @@ -112,11 +123,13 @@ install -D -m 755 plc_config.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/plc_config. echo "* Installing scripts in /usr/bin" mkdir -p ${RPM_BUILD_ROOT}/usr/bin rsync -av --exclude .svn bin/ ${RPM_BUILD_ROOT}/usr/bin/ +(cd $RPM_BUILD_ROOT/usr/bin; ln -s mtail.py mtail) chmod 755 ${RPM_BUILD_ROOT}/usr/bin/* # Install initscript echo "* Installing plc initscript" install -D -m 755 plc.init ${RPM_BUILD_ROOT}/etc/init.d/plc +install -D -m 644 plc.service ${RPM_BUILD_ROOT}/usr/lib/systemd/system/plc.service # Install initscripts echo "* Installing plc.d initscripts" @@ -196,6 +209,11 @@ if [ -x /sbin/chkconfig ] ; then /sbin/chkconfig plc on fi +%if "%{distro}" == "Fedora" && %{distrorelease} >= 27 +systemctl enable php-fpm +systemctl start php-fpm +%endif + %triggerpostun -- %{name} # 0 = erase, 1 = upgrade if [ $1 -gt 0 ] ; then @@ -228,8 +246,25 @@ fi /etc/planetlab /etc/plc_sliceinitscripts /etc/support-scripts -/usr/bin/ /usr/share/myplc/bashrc +# keep a detailed list, to avoid duplicate of plc-config, +# that belongs to the myplc-config rpm +/usr/bin/plc-config-tty +/usr/bin/db-config +/usr/bin/dns-config +/usr/bin/refresh-peer.py* +/usr/bin/mtail.py* +/usr/bin/mtail +/usr/bin/plc-map.py* +/usr/bin/plc-kml.py* +/usr/bin/clean-empty-dirs.py* +/usr/bin/plc-check-ssl-peering.py* +/usr/bin/plc-orphan-accounts.py* +/usr/bin/spot-aliens.py* +/usr/bin/check-hrns.py* +/usr/bin/check-vsys-defaults.py* +/usr/bin/spot-dup-accounts.sh +/usr/lib/systemd/system/plc.service %files config %defattr(-,root,root,-) @@ -238,6 +273,132 @@ fi %changelog +* 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