X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeconfig.spec;h=17fe6456e12ff3435ba81dc134d632b4e813e7df;hb=241fad2037b75a30530c54c37a8f9793a85a74a3;hp=677a431a747c55061c83cab93c629d319f0cba1a;hpb=9791d66bd10e280ef7d9004b9ed6b2cbaecc3d56;p=nodeconfig.git diff --git a/nodeconfig.spec b/nodeconfig.spec index 677a431..17fe645 100644 --- a/nodeconfig.spec +++ b/nodeconfig.spec @@ -4,8 +4,8 @@ %define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/WWW/trunk/PLCWWW.spec $ %define name nodeconfig -%define version 5.0 -%define taglevel 1 +%define version 4.3 +%define taglevel 7 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -17,7 +17,8 @@ License: PlanetLab Group: System Environment/Daemons Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch +# cannot do this as of f12 +#BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central @@ -26,7 +27,9 @@ URL: %(echo %{url} | cut -d ' ' -f 2) # We use set everywhere Requires: php >= 5.0 -Requires: PLCAPI >= 5.0 +Requires: PLCAPI >= 4.3 +# need the apache user at install-time +Requires: httpd %description @@ -40,14 +43,14 @@ reasons these scripts get installed in /var/www/html/PlanetLabConf. %setup -q %build -pushd yum +pushd nodeconfig/yum -EXCLUDE="exclude=kernel* util-vserver* iptables iproute" +KEXCLUDE="exclude=$(../../build/getkexcludes.sh)" -# expand list of excludes +# expand list of kexcludes for filein in $(find . -name '*.in') ; do file=$(echo $filein | sed -e "s,\.in$,,") - sed -e "s,@EXCLUDE@,$EXCLUDE,g" $filein > $file + sed -e "s,@KEXCLUDE@,$KEXCLUDE,g" $filein > $file done # scan fcdistros and catenate all repos in 'stock.repo' so db-config can be distro-independant @@ -65,6 +68,8 @@ popd %install rm -rf $RPM_BUILD_ROOT +pushd nodeconfig + echo "* nodeconfig: Installing PlanetLabConf pages" for dir in boot PlanetLabConf PLCAPI ; do @@ -73,16 +78,24 @@ for dir in boot PlanetLabConf PLCAPI ; do done # the yum area -- se db-config -# expose (fixed) myplc.repo.php as https:///yum/myplc.repo.php -install -D -m 644 ./yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php -# expose the fcdistro-dependant yum.conf as https:///yum/yum.conf -install -D -m 644 ./yum/%{fcdistro}/yum.conf $RPM_BUILD_ROOT/var/www/html/yum/yum.conf -# expose the (fcdistro-dependant) stock.repo as https:///yum/stock.repo -install -D -m 644 ./yum/%{fcdistro}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo +# expose (fixed) myplc.repo.php as https:///yum/myplc.repo.php +install -D -m 644 ./yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php +# expose the fcdistro-dependant yum.conf as https:///yum/yum.conf +install -D -m 644 ./yum/%{distroname}/yum.conf $RPM_BUILD_ROOT/var/www/html/yum/yum.conf +# expose the (fcdistro-dependant) stock.repo as https:///yum/stock.repo +install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo + +popd %clean rm -rf $RPM_BUILD_ROOT +%post +# the boot manager upload area +mkdir -p /var/log/bm +chown apache:apache /var/log/bm +chmod 700 /var/log/bm + %files %defattr(-,root,root,-) /var/www/html/boot @@ -91,7 +104,41 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/yum %changelog -* Wed Sep 10 2008 Thierry Parmentelat - nodeconfig-5.0-1 +* Wed Dec 23 2009 Marc Fiuczynski - nodeconfig-4.3-7 +- - decompose PlanetLabConf/sysctl.php into sysctl.conf and +- sysctl-ip_forward.php. This is in prep of phasing out the latter +- altogether, as enabling ip_forwarding should be something that is +- managed by NM. +- - PlanetLabConf/ntptickers.php migrated PlanetLabConf/ntp/step-tickers.php +- - Added sfa_config.php +- - updated ntp server set for .de (german) nodes. +- - f12 related changes from Thierry/Baris + +* Sun Nov 22 2009 Marc Fiuczynski - nodeconfig-4.3-6 +- For all MyPLC nodes deployed at Polish Telecom (PLC, PLE and CoBlitz), +- use the TP local NTP servers. + +* Mon Sep 07 2009 Thierry Parmentelat - nodeconfig-4.3-5 +- new script for updating the exentions set +- keys.php reviewed +- cleanup useless scripts + +* Sat Jul 04 2009 Stephen Soltesz - nodeconfig-4.3-4 +- add two views to the PLC config data, limited and unlimited. +- unlimited view reports all values. Requires the 'infrastructure=1' tag and +- that the call originates from the node. + +* Fri May 15 2009 Thierry Parmentelat - nodeconfig-4.3-3 +- changes to sysctl.conf for co* relating to tcp window scaling + +* Tue Mar 24 2009 Thierry Parmentelat - nodeconfig-4.3-2 +- renumbered 4.3 +- new script upload-bmlog.php +- attempts to ship decent yum configs for stock repos to nodes +- cleanup old stuff +- attempts to be 4.2 compatible + +* Wed Sep 10 2008 Thierry Parmentelat - nodeconfig-4.3-1 - reflects new names from the data model * Tue Apr 22 2008 Thierry Parmentelat - nodeconfig-4.2-4