From: Thierry Parmentelat Date: Wed, 9 Apr 2008 09:53:29 +0000 (+0000) Subject: branch and rpm-version renamed for using module-tools X-Git-Tag: PLEWWW-PLE.5.0-0~21 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1aea6b0b66f6b8922f1851cf4aa2d9eaaeb31647;p=plewww.git branch and rpm-version renamed for using module-tools --- diff --git a/PLCAPI/index.html b/PLCAPI/index.html deleted file mode 100644 index 40cd316..0000000 --- a/PLCAPI/index.html +++ /dev/null @@ -1,6 +0,0 @@ - -PLCAPI XML-RPC/SOAP Interface - -

PLCAPI XML-RPC/SOAP Interface

Please use XML-RPC or SOAP to access the PLCAPI.

- diff --git a/PLCWWW.spec b/PLCWWW.spec index 5f95d4a..8dfe424 100644 --- a/PLCWWW.spec +++ b/PLCWWW.spec @@ -3,7 +3,7 @@ # %define module_taglevel_varname subversion %define name PLCWWW -%define version 4.2 +%define version onelab.4.2 %define subversion 8 %define release %{subversion}%{?pldistro:.%{pldistro}}%{?date:.%{date}} diff --git a/boot/getnodeid.php b/boot/getnodeid.php deleted file mode 100644 index 19be436..0000000 --- a/boot/getnodeid.php +++ /dev/null @@ -1,29 +0,0 @@ - -// Copyright (C) 2006 The Trustees of Princeton University -// -// $Id: getnodeid.php 144 2007-03-28 07:52:20Z thierry $ $ -// - -// Get admin API handle -require_once 'plc_api.php'; -global $adm; - -if (!empty($_REQUEST['mac_addr'])) { - $mac_lower = strtolower(trim($_REQUEST['mac_addr'])); - $mac_upper = strtoupper(trim($_REQUEST['mac_addr'])); - $nodenetworks = $adm->GetNodeNetworks(array('mac' => array($mac_lower, $mac_upper))); -} else { - $nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -} - -if (!empty($nodenetworks)) { - print $nodenetworks[0]['node_id']; -} else { - print "-1"; -} - -?> diff --git a/boot/index.php b/boot/index.php deleted file mode 100644 index 5bb1ece..0000000 --- a/boot/index.php +++ /dev/null @@ -1,80 +0,0 @@ - -// Copyright (C) 2006 The Trustees of Princeton University -// -// $Id: index.php 144 2007-03-28 07:52:20Z thierry $ $ -// - -// Get admin API handle -require_once 'plc_api.php'; -global $adm; - -// Default bootmanager -$bootmanager = "bootmanager.sh.sgn"; - -// Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); - if (!empty($nodes)) { - $node = $nodes[0]; - } -} - -if (isset($node)) { - // Allow very old nodes that do not have a node key in their - // configuration files to use their "boot nonce" instead. The boot - // nonce is a random value generated by the node itself and POSTed - // by the Boot CD when it requests the Boot Manager. This is - // obviously not very secure, so we only allow it to be used if the - // requestor IP is the same as the IP address we have on record for - // the node. - - // 3.x CDs post 'version', 2.x CDs post 'id'. - if (!empty($_REQUEST['version'])) { - $version = trim($_REQUEST['version']); - } elseif (!empty($_REQUEST['id'])) { - $version = trim($_REQUEST['id']); - } else { - $version = "2.0"; - } - - if (empty($node['key']) && !empty($_REQUEST['nonce'])) { - // 3.x CDs post the boot nonce in ASCII hex. 2.x CDs post it in binary. - if (strstr($version, "2.0") === FALSE) { - // 3.x CDs post a trailing newline...sigh - $nonce = trim($_REQUEST['nonce']); - } else { - $nonce = bin2hex($_REQUEST['nonce']); - } - $adm->UpdateNode($node['node_id'], array('boot_nonce' => $nonce)); - } - - // Custom bootmanager for the node, e.g. - // planetlab-1.cs.princeton.edu_bootmanager.sh.sgn - $bootmanagers = array(strtolower($node['hostname']) + "_" + $bootmanager); - - // Custom bootmanager for the node group, e.g. - // alpha_bootmanager.sh.sgn - if (!empty($node['nodegroup_ids'])) { - $nodegroups = $adm->GetNodeGroups($node['nodegroup_ids']); - foreach ($nodegroups as $nodegroup) { - $bootmanagers[] = strtolower($nodegroup['name']) + "_" + $bootmanager; - } - } -} - -// Default bootmanager -$bootmanagers[] = $bootmanager; - -foreach ($bootmanagers as $bootmanager) { - if (file_exists($bootmanager)) { - readfile($bootmanager); - exit(); - } -} - -?> \ No newline at end of file diff --git a/boot/uudecode.gz b/boot/uudecode.gz deleted file mode 100755 index 040c34f..0000000 Binary files a/boot/uudecode.gz and /dev/null differ