X-Git-Url: http://git.onelab.eu/?p=nodeconfig.git;a=blobdiff_plain;f=nodeconfig.spec;h=1fe850d2b59488384d0e6088ecf43fab01a8426f;hp=d7f30a255f2b06093fb8203ec4f247116788bd78;hb=HEAD;hpb=2647c7d9d2d05660a3b44162f871acaf59a18541 diff --git a/nodeconfig.spec b/nodeconfig.spec index d7f30a2..1fe850d 100644 --- a/nodeconfig.spec +++ b/nodeconfig.spec @@ -1,11 +1,8 @@ # -# $Id$ -# -%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 5.2 +%define taglevel 5 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -17,16 +14,17 @@ 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 Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} # We use set everywhere Requires: php >= 5.0 -Requires: PLCAPI >= 5.0 +Requires: plcapi >= 5.2 %description @@ -40,58 +38,108 @@ reasons these scripts get installed in /var/www/html/PlanetLabConf. %setup -q %build -pushd yum - -EXCLUDE="exclude=kernel* util-vserver* iptables iproute" - -# expand list of excludes -for filein in $(find . -name '*.in') ; do - file=$(echo $filein | sed -e "s,\.in$,,") - sed -e "s,@EXCLUDE@,$EXCLUDE,g" $filein > $file -done - -# scan fcdistros and catenate all repos in 'stock.repo' so db-config can be distro-independant - -for fcdistro in $(ls); do - [ -d $fcdistro ] || continue - pushd $fcdistro/yum.myplc.d - rm -f stock.repo - cat *.repo > stock.repo - popd -done - -popd %install rm -rf $RPM_BUILD_ROOT echo "* nodeconfig: Installing PlanetLabConf pages" -for dir in boot PlanetLabConf PLCAPI ; do +for dir in PlanetLabConf PLCAPI ; do mkdir -p $RPM_BUILD_ROOT/var/www/html/$dir rsync -a --exclude .svn ./$dir/ $RPM_BUILD_ROOT/var/www/html/$dir/ 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/%{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 +# Install db-config.d files +echo "* Installing db-config.d files" +mkdir -p ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d +cp db-config.d/* ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d +chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/* %clean rm -rf $RPM_BUILD_ROOT +%post + %files %defattr(-,root,root,-) -/var/www/html/boot /var/www/html/PlanetLabConf /var/www/html/PLCAPI -/var/www/html/yum +/etc/planetlab/db-config.d %changelog -* Wed Sep 10 2008 Thierry Parmentelat - nodeconfig-5.0-1 +* Fri Nov 13 2015 Thierry Parmentelat - nodeconfig-5.2-5 +- do not try to add root_ssh_key.pub to authorized_keys in nodes + +* Fri Mar 21 2014 Thierry Parmentelat - nodeconfig-5.2-4 +- tweaks in node's ntp.conf + +* Tue Dec 10 2013 Thierry Parmentelat - nodeconfig-5.2-3 +- ntp.conf.php uses POST[node_id] instead of finding out caller's IP + +* Tue Apr 23 2013 Thierry Parmentelat - nodeconfig-5.2-2 +- pruned sfa_cofig.php + +* Thu Mar 07 2013 Thierry Parmentelat - nodeconfig-5.2-1 +- no-op, just bump to 5.2 to be in line with the rest of the system + +* Mon Apr 16 2012 Thierry Parmentelat - nodeconfig-5.0-7 +- no change, just reworked make sync to cope with lxc-hosted tests + +* Fri Feb 24 2012 Thierry Parmentelat - nodeconfig-5.0-6 +- support for hotfixes + +* Tue Feb 01 2011 Thierry Parmentelat - nodeconfig-5.0-5 +- remove backward compat to GetNodeNetworks and the like + +* Sun Jan 23 2011 Thierry Parmentelat - nodeconfig-5.0-4 +- trashed sfa_component_setup job & conf file + +* Wed Sep 01 2010 Baris Metin - nodeconfig-5.0-3 +- check file before reading the configuration. + +* Fri Apr 02 2010 Thierry Parmentelat - nodeconfig-5.0-2 +- new php scripts for configuring sfa component cron + +* Fri Jan 29 2010 Thierry Parmentelat - nodeconfig-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 +- the yum/ and boot/ subdirs have moved away from here + +* 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 @@ -106,4 +154,4 @@ rm -rf $RPM_BUILD_ROOT - former content has moved down into PlanetLabConf -%define module_current_branch 4.2 +%define module_current_branch 4.3