Skip to content

Commit 45e42f8

Browse files
committed
Group "Root" definitely needs to be hard-ignored.
1 parent 707d975 commit 45e42f8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/LdapSyncCommand.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,12 +1187,12 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
11871187
// Create directory groups of which don't exist in Gitlab
11881188
$this->logger->notice("Creating directory groups of which don't exist in Gitlab...");
11891189
foreach ($ldapGroupsSafe as $ldapGroupName => $ldapGroupMembers) {
1190-
/* Not sure if these groups actually need to be exempt yet.
11911190
if ("Root" == $ldapGroupName) {
11921191
$this->logger->info("Gitlab built-in root group will be ignored.");
11931192
continue; // The Gitlab root group should never be updated from LDAP.
11941193
}
11951194

1195+
/* Not sure if these groups actually need to be exempt yet.
11961196
if ("Users" == $ldapGroupName) {
11971197
$this->logger->info("Gitlab built-in users group will be ignored.");
11981198
continue; // The Gitlab users group should never be updated from LDAP.
@@ -1230,12 +1230,12 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
12301230
// Delete Gitlab groups of which don't exist in directory
12311231
$this->logger->notice("Deleting Gitlab groups of which don't exist in directory...");
12321232
foreach ($groupsSync["found"] as $gitlabGroupId => $gitlabGroupName) {
1233-
/* Not sure if these groups actually need to be exempt yet.
12341233
if ("Root" == $gitlabGroupName) {
12351234
$this->logger->info("Gitlab built-in root group will be ignored.");
12361235
continue; // The Gitlab root group should never be updated from LDAP.
12371236
}
12381237

1238+
/* Not sure if these groups actually need to be exempt yet.
12391239
if ("Users" == $gitlabGroupName) {
12401240
$this->logger->info("Gitlab built-in users group will be ignored.");
12411241
continue; // The Gitlab users group should never be updated from LDAP.
@@ -1275,12 +1275,12 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
12751275
continue;
12761276
}
12771277

1278-
/* Not sure if these groups actually need to be exempt yet.
12791278
if ("Root" == $gitlabGroupName) {
12801279
$this->logger->info("Gitlab built-in root group will be ignored.");
12811280
continue; // The Gitlab root group should never be updated from LDAP.
12821281
}
12831282

1283+
/* Not sure if these groups actually need to be exempt yet.
12841284
if ("Users" == $gitlabGroupName) {
12851285
$this->logger->info("Gitlab built-in users group will be ignored.");
12861286
continue; // The Gitlab users group should never be updated from LDAP.
@@ -1325,12 +1325,12 @@ private function deployGitlabUsersAndGroups(array $config, string $gitlabInstanc
13251325

13261326
$this->logger->notice("Synchronising Gitlab group members with directory group members...");
13271327
foreach ($groupsToSyncMembership as $gitlabGroupId => $gitlabGroupName) {
1328-
/* Not sure if these groups actually need to be exempt yet.
13291328
if ("Root" == $gitlabGroupName) {
13301329
$this->logger->info("Gitlab built-in root group will be ignored.");
13311330
continue; // The Gitlab root group should never be updated from LDAP.
13321331
}
13331332

1333+
/* Not sure if these groups actually need to be exempt yet.
13341334
if ("Users" == $gitlabGroupName) {
13351335
$this->logger->info("Gitlab built-in users group will be ignored.");
13361336
continue; // The Gitlab users group should never be updated from LDAP.

0 commit comments

Comments
 (0)