X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=60a982cfb270035044acffce1fb0296063467abc;hb=039b8b04f1e3e9f584abf83797ae3f1a8c421e23;hp=1128fbf9c581114da453e3525317e69ff87f17ba;hpb=e8f9d455fe3dbff172b144b0e2edcf400ce9c52d;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 1128fbf..60a982c 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,6 +1,6 @@ %define name myplc -%define version 5.0 -%define taglevel 18 +%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)" ) @@ -38,7 +38,7 @@ Requires: curl Requires: rsync Requires: python-devel Requires: yum -Requires: PyXML +#Requires: PyXML Requires: createrepo Requires: cpio Requires: wget @@ -52,11 +52,12 @@ Requires: findutils Requires: xmlsec1 Requires: xmlsec1-openssl Requires: ed -%if "%{distro}" == "Fedora" && %{distrorelease} >= 10 Requires: cronie -%else -Requires: vixie-cron +# starting with f16 we depend on this new rpm +%if "%{distro}" == "Fedora" && %{distrorelease} >= 16 +Requires: rpm-sign %endif + # planetlab stuff Requires: bootmanager Requires: bootcd-%{nodefamily} @@ -65,8 +66,14 @@ 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} >= 18 +Requires: mod_wsgi +%else +Requires: mod_python +%endif +Requires: nodeimage-%{nodefamily} Requires: myplc-docs Requires: myplc-release Requires: myplc-config @@ -109,11 +116,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}/lib/systemd/system/plc.service # Install initscripts echo "* Installing plc.d initscripts" @@ -233,13 +242,17 @@ fi /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 +/lib/systemd/system/plc.service %files config %defattr(-,root,root,-) @@ -248,6 +261,68 @@ 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