From 72de2135fed419c3867b5bac7644eda833c6e327 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 29 Oct 2019 14:16:57 +0100
Subject: [SSPS] Fix slxadmin-init script (read gpg key from file)

---
 satellit_installer/static_files/slxadmin-init/slxadmin-init.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/satellit_installer/static_files/slxadmin-init/slxadmin-init.php b/satellit_installer/static_files/slxadmin-init/slxadmin-init.php
index eb9a848..7f72b42 100644
--- a/satellit_installer/static_files/slxadmin-init/slxadmin-init.php
+++ b/satellit_installer/static_files/slxadmin-init/slxadmin-init.php
@@ -13,7 +13,7 @@ $SCRIPTDIR = dirname(__FILE__);
 
 // Where to get available Linux system information from
 $MINILINUX_URL = 'https://bwlp-masterserver.ruf.uni-freiburg.de/minilinux/sat_07';
-$MINILINUX_PUBKEY = file_get_contents($SCRIPTDIR . '/gpg-key.asc') || exit(1);
+$MINILINUX_PUBKEY = file_get_contents($SCRIPTDIR . '/gpg-key.asc');
 /*
  * Boilerplate
  */
@@ -38,6 +38,11 @@ spl_autoload_register(function ($class) {
  * Minilinux update source URL
  */
 
+if ($MINILINUX_PUBKEY === false) {
+	echo "Error reading GPG key from file\n";
+	exit(1);
+}
+
 Database::exec("INSERT INTO minilinux_source (sourceid, title, url, pubkey)
 	VALUES ('bwlp', 'bwLehrpool', :url, :pubkey)
 	ON DUPLICATE KEY UPDATE title = VALUES(title), url = VALUES(url), pubkey = VALUES(pubkey)",
-- 
cgit v1.2.3-55-g7522