From 334f3943abb2e2f523552a72f5f8034a511ddc21 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Fri, 27 Nov 2020 07:46:19 +0100
Subject: Migrate LDAP's install.php to a repair step

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 apps/user_ldap/appinfo/info.xml    |  3 +++
 apps/user_ldap/appinfo/install.php | 33 ---------------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 apps/user_ldap/appinfo/install.php

(limited to 'apps/user_ldap/appinfo')

diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 61197e2fd12..b618d2a203d 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -34,6 +34,9 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc
 	</background-jobs>
 
 	<repair-steps>
+		<install>
+			<step>OCA\User_LDAP\Migration\SetDefaultProvider</step>
+		</install>
 		<post-migration>
 			<step>OCA\User_LDAP\Migration\UUIDFixInsert</step>
 			<step>OCA\User_LDAP\Migration\RemoveRefreshTime</step>
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
deleted file mode 100644
index 731630000de..00000000000
--- a/apps/user_ldap/appinfo/install.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author root <root@localhost.localdomain>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-$config = \OC::$server->getConfig();
-$state = $config->getSystemValue('ldapIgnoreNamingRules', 'doSet');
-if ($state === 'doSet') {
-	\OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false);
-}
-
-$helper = new \OCA\User_LDAP\Helper($config, \OC::$server->getDatabaseConnection());
-$helper->setLDAPProvider();
-- 
cgit v1.2.3