Merge branch 'master' of git.onelab.eu:/git/nodeconfig

[nodeconfig.git] / PlanetLabConf / keys.php

diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php
index cfffba0..6eab92d 100755 (executable)
--- a/PlanetLabConf/keys.php
+++ b/PlanetLabConf/keys.php
@@ -13,8 +13,6 @@
 // Aaron Klingaman <alk@cs.princeton.edu>
 // Copyright (C) 2004 The Trustees of Princeton University
 //
-// $Id$
-//
 
 // Get admin API handle
 require_once 'plc_api.php';
@@ -33,12 +31,17 @@ if (!empty($_REQUEST['role'])) {
     }
   }
 }
-if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) {
-  $user = $adm->GetPersons(array('first_name' => 'Site', 'last_name' => 'Assistant'));
-  if (!empty($user)) {
-    $persons[] = $user[0];
-  }
-}
+
+//
+// NOTE: this user is not used by the monitor for the moment.
+//
+/* // {ple,pl}_monitor user is created on the nodes by the monitor-runlevelagent init script. */
+/* if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) { */
+/*   $user = $adm->GetPersons(array('first_name' => 'Site', 'last_name' => 'Assistant')); */
+/*   if (!empty($user)) { */
+/*     $persons[] = $user[0]; */
+/*   } */
+/* } */
 
 if (isset($_REQUEST['site_admin']) && isset($_REQUEST['node_id'])) {
   $nodes = $adm->GetNodes(array(intval($_REQUEST['node_id'])));
@@ -59,8 +62,13 @@ if (isset($_REQUEST['site_admin']) && isset($_REQUEST['node_id'])) {
   }
 }
 
-if (isset($_REQUEST['root']))
-  $keys[] = array('key' => file_get_contents(PLC_ROOT_SSH_KEY_PUB));
+// Thierry on July 20 2015
+// this has ceased to work ages ago with php5, as /etc/planetlab is not
+// allowed to php - which is right
+// exposing only admin's public keys is quite enough
+// which will be a relief for /var/log/php.log where this message is all over the place
+// if (isset($_REQUEST['root']))
+//  $keys[] = array('key' => file_get_contents(PLC_ROOT_SSH_KEY_PUB));
 
 
 if (!empty($persons)) {