git://git.onelab.eu
/
nodeimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and again
[nodeimage.git]
/
nodeconfig
/
yum
/
myplc.repo.php
diff --git
a/nodeconfig/yum/myplc.repo.php
b/nodeconfig/yum/myplc.repo.php
index
e26287d
..
11b48fa
100644
(file)
--- a/
nodeconfig/yum/myplc.repo.php
+++ b/
nodeconfig/yum/myplc.repo.php
@@
-5,9
+5,6
@@
// Thierry Parmentelat
// Copyright (C) 2008 INRIA
//
// Thierry Parmentelat
// Copyright (C) 2008 INRIA
//
-// $Id$
-// $URL$
-//
// For PLC_NAME and PLC_BOOT_HOST
include('plc_config.php');
// For PLC_NAME and PLC_BOOT_HOST
include('plc_config.php');
@@
-26,8
+23,6
@@
if (isset($_REQUEST['gpgcheck'])) {
}
echo "# Generated by myplc.repo.php\n";
}
echo "# Generated by myplc.repo.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'])) {
# we assume the node is not so old that it would not send node_id
# get node family
if ( ! isset($_REQUEST['node_id'])) {
@@
-42,7
+37,10
@@
$nodeflavour=$adm->GetNodeFlavour($node_id);
$nodefamily=$nodeflavour['nodefamily'];
$topdir=$_SERVER['DOCUMENT_ROOT'] . "/install-rpms/" . $nodefamily;
$nodefamily=$nodeflavour['nodefamily'];
$topdir=$_SERVER['DOCUMENT_ROOT'] . "/install-rpms/" . $nodefamily;
-$topurl="https://$PLC_BOOT_HOST" . "/install-rpms/" . $nodefamily;
+# Thierry : starting with fedora 12, yum complains about not being able to
+# verify the certificates; as we're using gpgcheck on top of the rest,
+# it's safe to use http only
+$topurl="http://$PLC_BOOT_HOST" . "/install-rpms/" . $nodefamily;
if ( is_dir (realpath($topdir))) {
echo "# This directory was checked to exist on the server-side\n";
if ( is_dir (realpath($topdir))) {
echo "# This directory was checked to exist on the server-side\n";