From d635a52fd965519eecb717ea5b953a5f12ef9b88 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 7 Jul 2020 16:36:46 +0200
Subject: [systemstatus/sysconfig] Manage LDADP via systemd

Finally got rid of our own little service manager. Status/restart
handling capabilities were added to the system status page.

TODO: Permissions for dnbd3, service (re)starting in general
---
 inc/event.inc.php | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'inc/event.inc.php')

diff --git a/inc/event.inc.php b/inc/event.inc.php
index 16e5323a..e5ade41b 100644
--- a/inc/event.inc.php
+++ b/inc/event.inc.php
@@ -41,7 +41,6 @@ class Event
 		// Tasks: fire away
 		$mountStatus = false;
 		$mountId = Trigger::mount();
-		$ldadpId = Trigger::ldadp();
 		$ipxeId = Trigger::ipxe();
 
 		// Check status of all tasks
@@ -53,17 +52,6 @@ class Event
 			$mountStatus = Taskmanager::waitComplete($mountId, 5000);
 
 		}
-		// LDAP AD Proxy
-		if ($ldadpId === false) {
-			EventLog::failure('Cannot start LDAP-AD-Proxy: Taskmanager unreachable!');
-			$everythingFine = false;
-		} else {
-			$res = Taskmanager::waitComplete($ldadpId, 5000);
-			if (Taskmanager::isFailed($res)) {
-				EventLog::failure('Starting LDAP-AD-Proxy failed', $res['data']['messages']);
-				$everythingFine = false;
-			}
-		}
 		// Primary IP address
 		if (!$autoIp) {
 			EventLog::failure("The server's IP address could not be determined automatically, and there is no valid address configured.");
@@ -116,15 +104,5 @@ class Event
 		}
 	}
 
-	/**
-	 * The activated configuration changed.
-	 */
-	public static function activeConfigChanged()
-	{
-		$task = Trigger::ldadp();
-		if ($task === false)
-			return;
-		TaskmanagerCallback::addCallback($task, 'ldadpStartup');
-	}
 
 }
-- 
cgit v1.2.3-55-g7522