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

diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php
index c46c307..6eab92d 100755 (executable)
--- a/PlanetLabConf/keys.php
+++ b/PlanetLabConf/keys.php
@@ -62,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)) {

diff --git a/nodeconfig.spec b/nodeconfig.spec
index 237bc5e..1fe850d 100644 (file)
--- a/nodeconfig.spec
+++ b/nodeconfig.spec
@@ -2,7 +2,7 @@
 
 %define name nodeconfig
 %define version 5.2
-%define taglevel 3
+%define taglevel 5
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -67,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/planetlab/db-config.d
 
 %changelog
+* Fri Nov 13 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-5
+- do not try to add root_ssh_key.pub to authorized_keys in nodes
+
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-4
+- tweaks in node's ntp.conf
+
 * Tue Dec 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-5.2-3
 - ntp.conf.php uses POST[node_id] instead of finding out caller's IP