git://git.onelab.eu
/
bootstrapfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yum to use http to fetch myplc rpms as they are GPG checked anyway
[bootstrapfs.git]
/
nodeconfig
/
yum
/
myplc.repo.php
diff --git
a/nodeconfig/yum/myplc.repo.php
b/nodeconfig/yum/myplc.repo.php
index
a0e8d28
..
d06da92
100644
(file)
--- a/
nodeconfig/yum/myplc.repo.php
+++ b/
nodeconfig/yum/myplc.repo.php
@@
-5,7
+5,8
@@
// Thierry Parmentelat
// Copyright (C) 2008 INRIA
//
// Thierry Parmentelat
// Copyright (C) 2008 INRIA
//
-// $Id: myplc.repo.php 9818 2008-07-04 07:54:06Z thierry $
+// $Id$
+// $URL$
//
// For PLC_NAME and PLC_BOOT_HOST
//
// For PLC_NAME and PLC_BOOT_HOST
@@
-24,12
+25,15
@@
if (isset($_REQUEST['gpgcheck'])) {
$gpgcheck = 0;
}
$gpgcheck = 0;
}
+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'])) {
- echo "#
myplc.repo.php: node_id is needed
";
- echo "# looks like you're running a very old NodeManager...";
- echo "# bailing out..";
+ echo "#
node_id is needed\n
";
+ echo "# looks like you're running a very old NodeManager...
\n
";
+ echo "# bailing out..
\n
";
exit;
}
exit;
}
@@
-38,15
+42,22
@@
$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 "# WARNING: plc-side yum repo $topdir NOT FOUND !!";
- }
+if ( is_dir (realpath($topdir))) {
+ echo "# This directory was checked to exist on the server-side\n";
+} else{
+ echo "# WARNING: plc-side yum repo $topdir NOT FOUND !!\n";
+}
+$repo_id=$nodefamily;
+$repo_name="$PLC_NAME $nodefamily";
echo <<< __PLC_REPO__
echo <<< __PLC_REPO__
-[$id]
-name=$name
+[$
repo_
id]
+name=$
repo_
name
baseurl=$topurl
gpgcheck=$gpgcheck
baseurl=$topurl
gpgcheck=$gpgcheck