X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodeconfig.spec;h=bfa91f360ff8c907f0e82b05a11f6282f6984cee;hb=1120dc1ceb426a5ae89b96f598fdbff3587817d4;hp=bb797fbbc72dd35e730d6a8209f5cebf024604ff;hpb=e08e0a58bd8c4eb4b992bde016df67fbfab4272f;p=nodeconfig.git

diff --git a/nodeconfig.spec b/nodeconfig.spec
index bb797fb..bfa91f3 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 4.3
-%define taglevel 7
+%define version 5.2
+%define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -23,13 +20,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 # We use set everywhere
 Requires: php >= 5.0
-Requires: PLCAPI >= 4.3
-# need the apache user at install-time
-Requires: httpd 
+Requires: plcapi >= 5.2
 
 %description
 
@@ -43,33 +38,10 @@ reasons these scripts get installed in /var/www/html/PlanetLabConf.
 %setup -q
 
 %build
-pushd nodeconfig/yum
-
-KEXCLUDE="exclude=$(../../build/getkexcludes.sh)"
-
-# expand list of kexcludes
-for filein in $(find . -name '*.in') ; do
-    file=$(echo $filein | sed -e "s,\.in$,,")
-    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
-
-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
 
-pushd nodeconfig
-
 echo "* nodeconfig: Installing PlanetLabConf pages"
 
 for dir in PlanetLabConf PLCAPI ; do
@@ -77,32 +49,50 @@ for dir in PlanetLabConf PLCAPI ; do
     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://<plc>/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://<plc>/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://<plc>/yum/stock.repo
-install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo
-
-popd
+# 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
-# 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/PlanetLabConf
 /var/www/html/PLCAPI
-/var/www/html/yum
+/etc/planetlab/db-config.d
 
 %changelog
+* Thu Mar 07 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-7
+- no change, just reworked make sync to cope with lxc-hosted tests
+
+* Fri Feb 24 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-6
+- support for hotfixes
+
+* Tue Feb 01 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-5
+- remove backward compat to GetNodeNetworks and the like
+
+* Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-4
+- trashed sfa_component_setup job & conf file
+
+* Wed Sep 01 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - nodeconfig-5.0-3
+- check file before reading the configuration.
+
+* Fri Apr 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.0-2
+- new php scripts for configuring sfa component cron
+
+* Fri Jan 29 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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 <mef@cs.princeton.edu> - 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
@@ -152,4 +142,4 @@ chmod 700 /var/log/bm
 - former content has moved down into PlanetLabConf
 
 
-%define module_current_branch 4.2
+%define module_current_branch 4.3