display system hostname and some memory info on dashboard
hostname may be useful in situations where several froxlors are reverse-proxied on a single webserver
This commit is contained in:
@@ -144,6 +144,15 @@ if ($page == 'overview') {
|
||||
$cron_last_runs = getCronjobsLastRun();
|
||||
$outstanding_tasks = getOutstandingTasks();
|
||||
|
||||
$system_hostname = gethostname();
|
||||
$meminfo= explode("\n", @file_get_contents("/proc/meminfo"));
|
||||
$memory = "";
|
||||
for ($i = 0; $i < sizeof($meminfo); ++$i) {
|
||||
if (substr($meminfo[$i], 0, 3) === "Mem") {
|
||||
$memory.= $meminfo[$i] . PHP_EOL;
|
||||
}
|
||||
}
|
||||
|
||||
if (function_exists('sys_getloadavg')) {
|
||||
$loadArray = sys_getloadavg();
|
||||
$load = number_format($loadArray[0], 2, '.', '') . " / " . number_format($loadArray[1], 2, '.', '') . " / " . number_format($loadArray[2], 2, '.', '');
|
||||
|
||||
@@ -2041,3 +2041,7 @@ $lng['serversettings']['option_unavailable_websrv'] = '<br><em class="red">Avail
|
||||
$lng['serversettings']['option_unavailable'] = '<br><em class="red">Option not availble due to other settings.</em>';
|
||||
$lng['serversettings']['letsencryptacmeconf']['title'] = "Path to the acme.conf snippet";
|
||||
$lng['serversettings']['letsencryptacmeconf']['description'] = "File name of the config snippet which allows the web server to serve the acme challenge.";
|
||||
|
||||
// Added in froxlor 0.9.38
|
||||
$lng['admin']['hostname'] = 'Hostname';
|
||||
$lng['admin']['memory'] = 'Memory usage';
|
||||
|
||||
@@ -1693,3 +1693,7 @@ $lng['serversettings']['option_unavailable_websrv'] = '<br><em class="red">Nur v
|
||||
$lng['serversettings']['option_unavailable'] = '<br><em class="red">Option aufgrund anderer Einstellungen nicht verfügbar.</em>';
|
||||
$lng['serversettings']['letsencryptacmeconf']['title'] = "Pfad zu acme.conf";
|
||||
$lng['serversettings']['letsencryptacmeconf']['description'] = "Dateiname der Konfiguration, die dem Webserver erlaubt, die ACME-Challenges zu bedienen.";
|
||||
|
||||
// Added in froxlor 0.9.38
|
||||
$lng['admin']['hostname'] = 'Hostname';
|
||||
$lng['admin']['memory'] = 'Speicherauslastung';
|
||||
|
||||
8
templates/Sparkle/admin/index/index.tpl
vendored
8
templates/Sparkle/admin/index/index.tpl
vendored
@@ -211,6 +211,10 @@ $header
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{$lng['admin']['hostname']}:</td>
|
||||
<td>{$system_hostname}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{$lng['admin']['serversoftware']}:</td>
|
||||
<td>{$_SERVER['SERVER_SOFTWARE']}</td>
|
||||
@@ -227,6 +231,10 @@ $header
|
||||
<td>{$lng['admin']['webserverinterface']}:</td>
|
||||
<td>$webserverinterface</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{$lng['admin']['memory']}:</td>
|
||||
<td><pre>$memory</pre></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{$lng['admin']['sysload']}:</td>
|
||||
<td>$load</td>
|
||||
|
||||
Reference in New Issue
Block a user