X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=yum.conf.php;h=71af0988535e679de9fa224318c3c7fffe49431b;hb=d33bb658fecb5693e3e3281a6bf68828a362f482;hp=d52a84a91a65c9b091ab9dd428aad98cf94f8006;hpb=9248d6e802d6aa3cbefdaf21af657ac8e6b2fa7b;p=nodeconfig.git

diff --git a/yum.conf.php b/yum.conf.php
index d52a84a..71af098 100755
--- a/yum.conf.php
+++ b/yum.conf.php
@@ -5,7 +5,7 @@
 // Mark Huang <mlhuang@cs.princeton.edu>
 // Copyright (C) 2004-2006 The Trustees of Princeton University
 //
-// $Id: yum.conf.php,v 1.4 2007/02/06 21:29:13 mlhuang Exp $
+// $Id$
 //
 
 // For PLC_NAME and PLC_BOOT_HOST
@@ -47,29 +47,40 @@ if (isset($_REQUEST['mirrorlist']) &&
   $mirrors = array("http://coblitz.planet-lab.org/pub/fedora/linux",
 		   "http://fedora.gtlib.cc.gatech.edu/pub/fedora.redhat/linux",
 		   "http://download.fedoraproject.org/pub/fedora/linux",
-		   "ftp://rpmfind.net/linux/fedora",
 		   "http://mirrors.kernel.org/fedora");
+		   #"ftp://rpmfind.net/linux/fedora",  still uses the old style of directory hierarchy
   $releasever = $_REQUEST['releasever'];
   switch ($_REQUEST['repo']) {
   case "base":
-    foreach ($mirrors as $mirror) {
-      echo "$mirror/core/$releasever/\$ARCH/os/\n";
-    }
+  	if ( intval($releasever) >= 7 )
+	{
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/releases/$releasever/Everything/\$ARCH/os/\n";
+		}
+
+	} else {
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/core/$releasever/\$ARCH/os/\n";
+		}
+	}
     break;
   case "updates":
-    foreach ($mirrors as $mirror) {
-      echo "$mirror/core/updates/$releasever/\$ARCH/\n";
-    }
-    break;
-  case "extras":
-    foreach ($mirrors as $mirror) {
-      echo "$mirror/extras/$releasever/\$ARCH/\n";
-    }
+  	if ( intval($releasever) >= 7 )
+	{
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/updates/$releasever/\$ARCH/\n";
+		}
+
+	} else {
+		foreach ($mirrors as $mirror) {
+		  echo "$mirror/core/updates/$releasever/\$ARCH/\n";
+		}
+	}
     break;
   }
 
   // Always list ourselves last
-  echo "http://$PLC_BOOT_HOST/install-rpms/planetlab/\n";
+  echo "https://$PLC_BOOT_HOST/install-rpms/planetlab/\n";
   exit;
 }
 
@@ -86,26 +97,18 @@ gpgcheck=$gpgcheck
 
 [base]
 name=Fedora Core \$releasever - \$basearch - Base
-mirrorlist=http://$PLC_BOOT_HOST/PlanetLabConf/yum.conf.php?mirrorlist&repo=base&releasever=\$releasever
+mirrorlist=https://$PLC_BOOT_HOST/PlanetLabConf/yum.conf.php?mirrorlist&repo=base&releasever=\$releasever
 gpgcheck=$gpgcheck
 # PlanetLab builds its own versions of these tools
 exclude=iptables kernel kernel kernel-devel kernel-smp kernel-smp-devel kernel-xen0 kernel-xen0-devel kernel-xenU kernel-xenU-devel mysql ulogd
 
 [updates]
 name=Fedora Core \$releasever - \$basearch - Released Updates
-mirrorlist=http://$PLC_BOOT_HOST/PlanetLabConf/yum.conf.php?mirrorlist&repo=updates&releasever=\$releasever
-gpgcheck=$gpgcheck
-# PlanetLab builds its own versions of these tools
-exclude=iptables kernel kernel kernel-devel kernel-smp kernel-smp-devel kernel-xen0 kernel-xen0-devel kernel-xenU kernel-xenU-devel mysql ulogd
-
-[extras]
-name=Fedora Extras \$releasever - \$basearch
-mirrorlist=http://$PLC_BOOT_HOST/PlanetLabConf/yum.conf.php?mirrorlist&repo=extras&releasever=\$releasever
+mirrorlist=https://$PLC_BOOT_HOST/PlanetLabConf/yum.conf.php?mirrorlist&repo=updates&releasever=\$releasever
 gpgcheck=$gpgcheck
 # PlanetLab builds its own versions of these tools
 exclude=iptables kernel kernel kernel-devel kernel-smp kernel-smp-devel kernel-xen0 kernel-xen0-devel kernel-xenU kernel-xenU-devel mysql ulogd
 
-
 EOF;
 
 // Figure out which repositories we actually have on this
@@ -115,7 +118,7 @@ foreach ($repos as $repo) {
   $id = $repo[0];
   $name = $repo[1] . " -- " . "$PLC_NAME Central";
   $dir = "/install-rpms/" . $repo[2];
-  $baseurl = "http://$PLC_BOOT_HOST" . $dir . "/";
+  $baseurl = "https://$PLC_BOOT_HOST" . $dir . "/";
 
   if (is_dir(realpath($_SERVER['DOCUMENT_ROOT'] . $dir))) {
     echo <<<EOF