From 4aad3f3e894a061ee94f5386dd9256051491fa4a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 3 Nov 2017 17:49:58 +0100
Subject: [rebootcontrol] Conditional rebuild of config.tgz, proper permissions
 for authorized_keys

---
 modules-available/rebootcontrol/hooks/config-tgz.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules-available/rebootcontrol/hooks')

diff --git a/modules-available/rebootcontrol/hooks/config-tgz.inc.php b/modules-available/rebootcontrol/hooks/config-tgz.inc.php
index 0b706960..90e32e8a 100644
--- a/modules-available/rebootcontrol/hooks/config-tgz.inc.php
+++ b/modules-available/rebootcontrol/hooks/config-tgz.inc.php
@@ -1,14 +1,15 @@
 <?php
 
 $pubkey = SSHKey::getPublicKey();
-$tmpfile = '/tmp/bwlp-' . md5($pubkey) . '.tar';
+$tmpfile = '/tmp/bwlp-' . md5($pubkey) . '-2.tar';
 if (!is_file($tmpfile) || !is_readable($tmpfile) || filemtime($tmpfile) + 86400 < time()) {
 	if (file_exists($tmpfile)) {
 		unlink($tmpfile);
 	}
 	try {
 		$a = new PharData($tmpfile);
-		$a->addFromString("/root/.ssh/authorized_keys.d/rebootcontrol", $pubkey);
+		$a["/etc/ssh/mgmt/authorized_keys"] = $pubkey;
+		$a["/etc/ssh/mgmt/authorized_keys"]->chmod(0600);
 		$file = $tmpfile;
 	} catch (Exception $e) {
 		EventLog::failure('Could not include ssh key for reboot-control in config.tgz', (string)$e);
-- 
cgit v1.2.3-55-g7522