X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=blobdiff_plain;f=nodeconfig%2Fyum%2Fyum.php;fp=nodeconfig%2Fyum%2Fstock.repo.php;h=81dd1b678b62650473e3543740138a11df08b73f;hp=fa73caddf400cf7fd9fe51af23e63aa0546074e6;hb=04045efb32bee5e9cff9bd1027aa53135fa5c915;hpb=51411ee59c8bce4342793f13fc2f6af729f53d3a

diff --git a/nodeconfig/yum/stock.repo.php b/nodeconfig/yum/yum.php
similarity index 56%
rename from nodeconfig/yum/stock.repo.php
rename to nodeconfig/yum/yum.php
index fa73cad..81dd1b6 100644
--- a/nodeconfig/yum/stock.repo.php
+++ b/nodeconfig/yum/yum.php
@@ -25,44 +25,42 @@ if (isset($_REQUEST['gpgcheck'])) {
   $gpgcheck = 0;
 }
 
-echo "# Generated by stock.repo.php\n";
+echo "# Generated by yum.php\n";
 echo '# $Id$' . "\n";
 echo '# $URL$' . "\n";
 # we assume the node is not so old that it would not send node_id
 # get node family
 if ( ! isset($_REQUEST['node_id'])) {
-  echo "# node_id is needed\n";
+  echo "# yum.php expects node_id to be set\n";
   echo "# looks like you're running a very old NodeManager...\n";
   echo "# bailing out..\n";
   exit;
  }
-
 $node_id = intval($_REQUEST['node_id']);
 $nodeflavour=$adm->GetNodeFlavour($node_id);
-$nodefcdistro=$nodeflavour['fcdistro'];
+$fcdistro=$nodeflavour['fcdistro'];
+
+if ( ! isset($_REQUEST['path'])) {
+  echo "# yum.php expect path to be set - bailing out\n";
+  exit;
+ }
+$path = $_REQUEST['path'];
 
-# try to open /var/www/html/yum/<fcdistro>/yum.myplc.d/stock.repo
-# otherwise use the static version in 
-# /var/www/html/yum.legacy/stock.repo
-$fc_name="/var/www/html/yum/" . $fcdistro . "/yum.myplc.d/stock.repo";
-$fb_name="/var/www/html/yum.legacy/stock.repo";
+# try to open /var/www/html/yum/<fcdistro>/<path>
+$fc_name="/var/www/html/yum/" . $fcdistro . "/" . $path;
 
 $fc_contents=file_get_contents($fc_name);
 if ($fc_contents) {
-  echo "# retrieved " . $fc_name . "\n";
+  echo "#\n";
+  echo "# yum.php has retrieved " . $fc_name . "\n";
+  echo "#\n";
   print $fc_contents;
   exit;
  }
-$fb_contents=file_get_contents($fb_name);
-if ($fb_contents) {
-  echo "# retrieved fallback (fcdistro " . $fcdistro " unknown) " . $fb_name . "\n";
-  print $fb_contents;
-  exit;
- }
-echo "# Could not find any of the following\n";
+echo "#\n";
+echo "# yum.php could not find the following path\n";
 echo "# " . $fc_name . "\n";
-echo "# " . $fb_name . "\n";
-echo "# bailing out";
+echo "# bailing out\n";