Skip to content

Commit d71bae3

Browse files
committed
Added code to remove the domain module to the installer.
1 parent 837d183 commit d71bae3

File tree

5 files changed

+19
-0
lines changed

5 files changed

+19
-0
lines changed

install/dist/lib/fedora.lib.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,6 +1056,9 @@ public function install_ispconfig()
10561056
exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
10571057
}
10581058

1059+
//* Remove Domain module as its functions are available in the client module now
1060+
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1061+
10591062
}
10601063

10611064
public function configure_dbserver()

install/dist/lib/gentoo.lib.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,10 @@ public function install_ispconfig()
10381038
chown('/usr/local/bin/run-getmail.sh', 'getmail');
10391039
}
10401040
chmod('/usr/local/bin/run-getmail.sh', 0744);
1041+
1042+
//* Remove Domain module as its functions are available in the client module now
1043+
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1044+
10411045
}
10421046
}
10431047

install/dist/lib/opensuse.lib.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,9 @@ public function install_ispconfig()
10981098
exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
10991099
}
11001100

1101+
//* Remove Domain module as its functions are available in the client module now
1102+
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
1103+
11011104

11021105
}
11031106

install/lib/installer_base.lib.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,6 +1995,11 @@ public function install_ispconfig() {
19951995
fclose($fh);
19961996
*/
19971997
}
1998+
1999+
//* Remove Domain module as its functions are available in the client module now
2000+
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
2001+
2002+
19982003
}
19992004

20002005
public function configure_dbserver() {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
-- Removal of the domain module
3+
UPDATE sys_user SET startmodule = 'dashboard' WHERE startmodule = 'domain';
4+
UPDATE sys_user SET modules = replace(modules, ',domain', '') WHERE modules like '%domain%';

0 commit comments

Comments
 (0)