X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=yum.conf.php;h=74a338c246d3236c75f4517c579470369322c936;hb=7482589cacbd077d0f72246a93ab9c61e7afdd43;hp=de039588765ed4d3bdc1a3d3d995b468a2e9606b;hpb=89790bd82bcdc601dc09e638bd4fc6baf4683d6f;p=nodeconfig.git

diff --git a/yum.conf.php b/yum.conf.php
index de03958..74a338c 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.2 2007/02/06 15:52:26 mlhuang Exp $
+// $Id$
 //
 
 // For PLC_NAME and PLC_BOOT_HOST
@@ -14,10 +14,13 @@ include('plc_config.php');
 $PLC_NAME = PLC_NAME;
 $PLC_BOOT_HOST = PLC_BOOT_HOST;
 
-$repos = array(array('FedoraCore2Base', 'Fedora Core 2 Base', 'stock-fc2'),
+$oldrepos = array(array('FedoraCore2Base', 'Fedora Core 2 Base', 'stock-fc2'),
 	       array('FedoraCore2Updates', 'Fedora Core 2 Updates', 'updates-fc2'),
 	       array('ThirdParty', 'Third Party RPMS', '3rdparty'));
 
+$repos = array(array('ThirdParty', 'Third Party RPMS', '3rdparty'));
+
+
 if (isset($_REQUEST['alpha'])) {
   $repos[] = array('PlanetLabAlpha', 'PlanetLab Alpha RPMS', 'planetlab-alpha');
 } elseif (isset($_REQUEST['beta'])) {
@@ -58,15 +61,10 @@ if (isset($_REQUEST['mirrorlist']) &&
       echo "$mirror/core/updates/$releasever/\$ARCH/\n";
     }
     break;
-  case "extras":
-    foreach ($mirrors as $mirror) {
-      echo "$mirror/extras/$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;
 }
 
@@ -83,19 +81,17 @@ 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
-
-[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;
 
@@ -106,7 +102,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
@@ -120,4 +116,4 @@ EOF;
   }
 }
 
-?>
\ No newline at end of file
+?>