Skip to content

Commit 71ca427

Browse files
committed
Fix to remove the confusing and unnecessary separate “Status” plugin
1 parent 0b422e2 commit 71ca427

File tree

3 files changed

+12
-56
lines changed

3 files changed

+12
-56
lines changed

lib/Virtualmin/Config/Plugin/Status.pm

Lines changed: 0 additions & 53 deletions
This file was deleted.

lib/Virtualmin/Config/Plugin/Webmin.pm

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ sub actions {
3636

3737
$self->spin();
3838
eval {
39+
# Configure status module
40+
foreign_require("status");
41+
$status::config{'sched_mode'} = 1;
42+
$status::config{'sched_int'} ||= 5;
43+
$status::config{'sched_offset'} ||= 0;
44+
lock_file("$config_directory/status/config");
45+
save_module_config(\%status::config, 'status');
46+
unlock_file("$config_directory/status/config");
47+
status::setup_cron_job();
3948
# Disable Webmin upgrades from UI
4049
save_module_acl( { disallow => 'upgrade' }, 'root', 'webmin' );
4150
# Update Webmin configuration

lib/Virtualmin/Config/Stack.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ sub new {
1515
sub common_modules {
1616
return (
1717
"Webmin", "MySQL", "Firewall",
18-
"Quotas", "Shells", "Status",
19-
"Virtualmin", "Etckeeper", "Apache",
20-
"AWStats", "Fail2ban"
18+
"Quotas", "Shells", "Virtualmin",
19+
"Etckeeper", "Apache", "AWStats",
20+
"Fail2ban"
2121
);
2222
}
2323

0 commit comments

Comments
 (0)