From 11c488215620d12c1f79fc9b05deb9928d2cab39 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 16 Nov 2020 14:03:21 +0100
Subject: [sysconfig] SSH: Split pubkey and rest of config, add more options

Now we can have exactly one SSH-Config per sysconfig, which avoids
confusion due to config mismatch regarding "allow pw" and "port".
The install include takes care of splitting the key into a new module
for existing modules, but doesn't remove duplicate SshConfig modules
from sysconfigs, as this might lead to additional confusion. Next time
the user edits a sysconfig, they are forced to pick exactly one
SshConfig module.

The "allow password login" option was extended to allow password login
for non-root users only in addition to simply being "yes" or "no".
There's an additional option that can entirely limit the group of users
allowed to log in via SSH.
---
 modules-available/sysconfig/inc/configmodule.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules-available/sysconfig/inc/configmodule.inc.php')

diff --git a/modules-available/sysconfig/inc/configmodule.inc.php b/modules-available/sysconfig/inc/configmodule.inc.php
index a9035d78..f3906378 100644
--- a/modules-available/sysconfig/inc/configmodule.inc.php
+++ b/modules-available/sysconfig/inc/configmodule.inc.php
@@ -321,23 +321,25 @@ abstract class ConfigModule
 	 *
 	 * @return boolean true on success, false otherwise
 	 */
-	public final function update($title)
+	public final function update($title = '')
 	{
 		if ($this->moduleId === 0)
 			Util::traceError('ConfigModule::update called when moduleId == 0');
-		if (empty($title))
-			$title = $this->moduleTitle;
+		if (!empty($title)) {
+			$this->moduleTitle = $title;
+		}
 		if (!$this->validateConfig())
 			return false;
 		// Update
 		Database::exec("UPDATE configtgz_module SET title = :title, contents = :contents, status = :status, dateline = :now "
 			. " WHERE moduleid = :moduleid LIMIT 1", array(
 			'moduleid' => $this->moduleId,
-			'title' => $title,
+			'title' => $this->moduleTitle,
 			'contents' => json_encode($this->moduleData),
 			'status' => 'OUTDATED',
 			'now' => time(),
 		));
+		$this->moduleStatus = 'OUTDATED';
 		return true;
 	}
 
-- 
cgit v1.2.3-55-g7522