diff --git a/servers/config b/servers/config
index bb6d6ef70..7fa48d25b 100644
--- a/servers/config
+++ b/servers/config
@@ -2,7 +2,6 @@ resolve=1
scan_time=5
display_mode=0
sort_mode=0
-groups_dir=/etc/cluster/groups
show_status=1
deflink=0
deffast=2
diff --git a/servers/config-debian-linux b/servers/config-debian-linux
index 0ee9afb13..fbb6119f1 100644
--- a/servers/config-debian-linux
+++ b/servers/config-debian-linux
@@ -2,7 +2,6 @@ resolve=1
scan_time=5
display_mode=0
sort_mode=0
-groups_dir=/etc/cluster/groups
show_status=1
deflink=0
deffast=2
diff --git a/servers/config-redhat-linux b/servers/config-redhat-linux
index 4a1363c4c..12429e40c 100644
--- a/servers/config-redhat-linux
+++ b/servers/config-redhat-linux
@@ -2,7 +2,6 @@ resolve=1
scan_time=5
display_mode=0
sort_mode=0
-groups_dir=/etc/cluster/groups
show_status=1
deflink=0
deffast=2
diff --git a/servers/config-syno-linux b/servers/config-syno-linux
index c6ff5f358..a7ae90dfb 100644
--- a/servers/config-syno-linux
+++ b/servers/config-syno-linux
@@ -1,7 +1,6 @@
deffast=2
max_servers=100
resolve=1
-groups_dir=/etc/cluster/groups
deflink=0
show_ip=0
scan_time=5
diff --git a/servers/config.info b/servers/config.info
index fa097ae65..5c67653b3 100644
--- a/servers/config.info
+++ b/servers/config.info
@@ -13,5 +13,4 @@ skipips=IPs or hostnames of systems to not detect,9,50,5,\t
skipifaces=Network interfaces to not detect,0
max_servers=Show search form if number of servers exceeds,0
line2=System configuration,11
-groups_dir=MSC cluster groups directory,0
capath=File or directory for remote SSL CA certificates,0
diff --git a/servers/config.info.ar b/servers/config.info.ar
index cf7e39c90..2a33044e7 100644
--- a/servers/config.info.ar
+++ b/servers/config.info.ar
@@ -13,5 +13,4 @@ skipips=لا تكشف IPs أو أسماء المضيفين من الأنظمة,9
skipifaces=لا تكشف واجهات الشبكة,0
max_servers=إظهار نموذج البحث إذا تجاوز عدد الخوادم,0
line2=تكوين النظام,11
-groups_dir=دليل المجموعات العنقودية MSC,0
capath=ملف أو دليل لشهادات SSL CA عن بعد,0
diff --git a/servers/config.info.ca b/servers/config.info.ca
index 8a5849660..4e21cdd9b 100644
--- a/servers/config.info.ca
+++ b/servers/config.info.ca
@@ -13,5 +13,4 @@ skipips=IPs o noms de host dels sistemes que no s'an de detectar,9,50,5,\t
skipifaces=Interfícies de xarxa que no s'han de detectar,0
max_servers=Mostra el formulari de cerca si el nombre de servidors és excessiu,0
line2=Configuració del sistema,11
-groups_dir=Directori de grups de cluster MSC,0
capath=Fitxer o directori dels certificats CS SSL remots,0
diff --git a/servers/config.info.cs b/servers/config.info.cs
index 66e2c5906..b81be6b46 100644
--- a/servers/config.info.cs
+++ b/servers/config.info.cs
@@ -5,4 +5,3 @@ display_mode=Ukázat servery jako,1,1-tabulku,0-ikony
sort_mode=Seřadit servery podle,1,4-IP adres,1-jména host,2-popisu,3-OS,5-skupiny,0-pořadí vzniku
show_status=Ukázat stav serverů?,1,1-ano,0-ne
line2=SKonfigurace systému,11
-groups_dir=Adresář MSC cluster skupin,0
diff --git a/servers/config.info.de b/servers/config.info.de
index 2a9d79a36..d33a13b64 100644
--- a/servers/config.info.de
+++ b/servers/config.info.de
@@ -13,5 +13,4 @@ skipips=IPs oder Hostnamen des Systems nicht erkennen,9,50,5,\t
skipifaces=Netzwerkschnittstelle nicht erkennen,0
max_servers=Suchformular anzeigen, wenn Anzahl an Server überschritten wurde,0
line2=Systemkonfiguration,11
-groups_dir=MSC-Cluster Gruppen-Verzeichnis,0
capath=Datei oder Verzeichnis für entfernte SSL-CA-Zertifikate,0
diff --git a/servers/config.info.es b/servers/config.info.es
index a4dd740bf..9c621838e 100644
--- a/servers/config.info.es
+++ b/servers/config.info.es
@@ -5,4 +5,3 @@ display_mode=Mostrar servidores como,1,1-Tabla,0-Iconos
sort_mode=Clasificar servidores por,1,4-Dirección IP,1-Nombre de máquina,2-Descripción,3-SO,5-Grupo,0-Orden de creación
show_status=Mostrar el estado de los servidores,1,1-Sí,0-No
line2=Configuración de sistema,11
-groups_dir=Directorio de grupos de clúster MSC,0
diff --git a/servers/config.info.fr b/servers/config.info.fr
index 35ce542ba..653fa1a02 100644
--- a/servers/config.info.fr
+++ b/servers/config.info.fr
@@ -5,4 +5,3 @@ display_mode=Afficher les serveurs sous forme,1,1-De table,0-D'icônes
sort_mode=Trier les serveurs par,1,4-Adresse IP,1-Nom d'hôte,2-Description,3-OS,5-Groupe,0-Ordre de création
show_status=Afficher l'état des serveurs,1,1-Oui,0-Non
line2=Configuration du système,11
-groups_dir=Répertoire des groupes de cluster MSC,0
diff --git a/servers/config.info.it b/servers/config.info.it
index 89184e28b..206456449 100644
--- a/servers/config.info.it
+++ b/servers/config.info.it
@@ -12,4 +12,3 @@ auto_type=Tipo di sistema predefinito,14,show_deftype
skipips=Indirizzi IP o nomi host del sistema da non individuare,9,50,5,\t
skipifaces=Interfacce di rete da non individuare,0
line2=Configurazione di sistema,11
-groups_dir=Directory dei gruppi cluster MSC,0
diff --git a/servers/config.info.ja b/servers/config.info.ja
index 7445fb9cd..5a0f01736 100644
--- a/servers/config.info.ja
+++ b/servers/config.info.ja
@@ -13,5 +13,4 @@ skipips=検索から除外する IP アドレス、ホスト名,9,50,5,\t
skipifaces=検索から除外するネットワークインターフェース,0
max_servers=検索結果の上限,0
line2=システム設定,11
-groups_dir=MSC cluster groups directory,0
capath=リモート SSL 証明書のファイルまたはディレクトリ,0
diff --git a/servers/config.info.ko b/servers/config.info.ko
index 4102bac47..4cb205d18 100644
--- a/servers/config.info.ko
+++ b/servers/config.info.ko
@@ -12,4 +12,3 @@ auto_type=기본 시스템 형식,14,show_deftype
skipips=탐지하지 않을 시스템의 IP 또는 호스트이름,9,50,5,\t
skipifaces=감지하지 않을 네트워크 인터페이스,0
line2=시스템 설정,11
-groups_dir=MCS 클러스터 그룹 디렉토리,0
diff --git a/servers/config.info.ms b/servers/config.info.ms
index 0dfec8b68..322992eaa 100644
--- a/servers/config.info.ms
+++ b/servers/config.info.ms
@@ -12,4 +12,3 @@ auto_type=Jenis sistem lalai,14,show_deftype
skipips=IP atau nama hos sistem tidak dapat dikesan,9,50,5,\t
skipifaces=Antara muka rangkaian tidak dapat dikesan,0
line2=Konfigurasi sistem,11
-groups_dir=Kluster direktori grup MSC,0
diff --git a/servers/config.info.nl b/servers/config.info.nl
index c90eddd5e..4f4928cc4 100644
--- a/servers/config.info.nl
+++ b/servers/config.info.nl
@@ -12,4 +12,3 @@ auto_type=Standaard systeem type,14,show_deftype
skipips=IP of hostnamen van systemen om niet te detecteren,9,50,5,\t
skipifaces=Netwerk interfaces om niet te detecteren,0
line2=Systeem configuratie,11
-groups_dir=MSC cluster groepen directory,0
diff --git a/servers/config.info.no b/servers/config.info.no
index da231f5ec..dbe156548 100644
--- a/servers/config.info.no
+++ b/servers/config.info.no
@@ -12,4 +12,3 @@ auto_type=Standard systemtype,14,show_deftype
skipips=IPer eller vertsnavn på system som ikke skal oppdages,9,50,5,\t
skipifaces=Nettverksgrensesnitt som ikke skal oppdages,0
line2=System konfigurasjon,11
-groups_dir=MSC klynge gruppe katalog,0
diff --git a/servers/config.info.pl b/servers/config.info.pl
index 5b551e5d0..427f98c81 100644
--- a/servers/config.info.pl
+++ b/servers/config.info.pl
@@ -13,4 +13,3 @@ skipips=Adresy IP lub nazwy hostów systemu nie zostały wykryte,9,50,5,\t
skipifaces=Interfejs sieci nie został wykryty,0
max_servers=Pokaż formularz wyszukiwania, jeśli liczba serwerów przekracza,0
line2=Ustawienia systemowe,11
-groups_dir=Grupy katalogu klastra MSC,0
diff --git a/servers/config.info.pt_BR b/servers/config.info.pt_BR
index cdb102c35..f0947a280 100644
--- a/servers/config.info.pt_BR
+++ b/servers/config.info.pt_BR
@@ -5,4 +5,3 @@ display_mode=Exibir servidor como,1,1-Tabela,0-Ícones
sort_mode=Ordenar servidor por,1,4-Endereço IP,1-Hostname,2-Descrição,3-OS,5-Grupo,0-Ordem de criação
show_status=Exibir status para servidores,1,1-Sim,0-Não
line2=Configuração do sistema,11
-groups_dir=Diretório de grupos de cluster MSC,0
diff --git a/servers/config.info.ru b/servers/config.info.ru
index 1385afa06..a8d752e68 100644
--- a/servers/config.info.ru
+++ b/servers/config.info.ru
@@ -12,4 +12,3 @@ auto_type=Тип системы по-умолчанию,14,show_deftype
skipips=Исключить из поиска IP-адреса или имена-хостов,9,50,5,\t
skipifaces=Исключить из поиска сетевые интерфейсы,0
line2=Конфигурация системы,11
-groups_dir=Директория MSC cluster groups,0
diff --git a/servers/config.info.sk b/servers/config.info.sk
index ff29d6925..dc8cd4078 100644
--- a/servers/config.info.sk
+++ b/servers/config.info.sk
@@ -5,4 +5,3 @@ display_mode=Zobraziť servre ako,1,1-Tabuľku,0-Ikonky
sort_mode=Triediť servre podľa,1,4-IP adresy,1-mena,2-popisu,3-OS,5-skupiny,0-poradia vytvorenia
show_status=Zobrazovať stav serverov,1,1-Áno,0-Nie
line2=Systémová konfigurácia,11
-groups_dir=Adresár pre MSC cluster skupiny,0
diff --git a/servers/config.info.tr b/servers/config.info.tr
index 276fb2070..1537878fe 100644
--- a/servers/config.info.tr
+++ b/servers/config.info.tr
@@ -5,4 +5,3 @@ display_mode=Sunucuları şu şekilde göster,1,1-Tablo,0-Simgeler
sort_mode=Sunucuları sıralama biçimi,1,4-IP Adresi,1-Makine adı,2-Açıklama,3-OS,5-Grup,0-Oluşturulduğu sıra ile
show_status=Sunucular için durum gösterilsin,1,1-Evet,0-Hayır
line2=Sistem yapılandırması,11
-groups_dir=MSC cluster grup dizini,0
diff --git a/servers/servers-lib.pl b/servers/servers-lib.pl
index 137974a33..bab3dccf1 100755
--- a/servers/servers-lib.pl
+++ b/servers/servers-lib.pl
@@ -215,8 +215,6 @@ which is a hash ref with the keys :
sub list_all_groups
{
my (@rv, %gmap, $s, $f, $gn);
-
-# Add webmin servers groups
foreach $s (grep { $_->{'group'} } ($_[0] ? @{$_[0]} : &list_servers())) {
foreach $gn (split(/\t+/, $s->{'group'})) {
my $grp = $gmap{$gn};
@@ -227,53 +225,6 @@ foreach $s (grep { $_->{'group'} } ($_[0] ? @{$_[0]} : &list_servers())) {
push(@{$grp->{'members'}}, $s->{'host'});
}
}
-
-# Add MSC cluster groups
-if ($config{'groups_dir'} && opendir(DIR, $config{'groups_dir'})) {
- foreach $f (readdir(DIR)) {
- next if ($f eq '.' || $f eq '..');
- my $grp = $gmap{$f};
- if (!$grp) {
- $gmap{$f} = $grp = { 'name' => $f, 'type' => 1 };
- push(@rv, $grp);
- }
- open(GROUP, "<$config{'groups_dir'}/$f");
- while() {
- s/\r|\n//g;
- s/#.*$//;
- if (/(\S*)\[(\d)-(\d+)\](\S*)/) {
- # Expands to multiple hosts
- push(@{$grp->{'members'}},
- map { $1.$_.$4 } ($2 .. $3));
- }
- elsif (/(\S+)/) {
- push(@{$grp->{'members'}}, $1);
- }
- }
- close(GROUP);
- }
- closedir(DIR);
- }
-
-# Fix up MSC groups that include other groups
-while(1) {
- my ($grp, $any);
- foreach $grp (@rv) {
- my @mems;
- foreach my $m (@{$grp->{'members'}}) {
- if ($m =~ /^:(.*)$/) {
- push(@mems, @{$gmap{$1}->{'members'}});
- $any++;
- }
- else {
- push(@mems, $m);
- }
- }
- $grp->{'members'} = \@mems;
- }
- last if (!$any);
- }
-
return @rv;
}