Trez/docker-mods-uptime-kuma-timeout-fix
4
0
Fork 0
mirror of https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git synced 2026-06-24 09:12:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added SSL certificate status

Browse Source
This commit is contained in:
quietsy
2022-01-15 22:59:09 +02:00
parent 7c2dfcb352
commit a1d131dc0f
3 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.assets/example.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 306 KiB

README.md
+4 -4
View File
@@ -15,11 +15,11 @@ If adding multiple mods, enter them in an array separated by |, such as DOCKER_M
Navigate to `dashboard.domain.com` from your LAN to view the dashboard.
## Notes
- The application discovery scans all the conf files and looks for the following structure in accordance with the samples, incorrect discovery results can be fixed by using the structure.
- The application discovery scans the proxy configs and looks for the following structure in accordance with the samples:
```yaml
set $upstream_app something;
set $upstream_port 123;
set $upstream_proto http;
set $upstream_app <container/address>;
set $upstream_port <port>;
set $upstream_proto <protocol>;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
```
- Either [Swag Maxmind mod](https://github.com/linuxserver/docker-mods/tree/swag-maxmind) or [Swag DBIP mod](https://github.com/linuxserver/docker-mods/tree/swag-dbip) are required to enable the geo location graph.
root/dashboard/www/index.php
+37 -6
View File
@@ -24,11 +24,11 @@
.far, .fas {
font-family: "Font Awesome 5 Free" !important;
}
.fa-exclamation-circle,.fa-check-circle, .fa-info-circle, .fa-edit {
.fa-exclamation-circle,.fa-check-circle, .fa-info-circle, .fa-edit, .fa-lock {
font-size:20px;
padding: 2px;
}
.fa-check-circle {
.fa-check-circle, .fa-lock {
color: #5DB56A;
}
.fa-exclamation-circle {
@@ -38,6 +38,10 @@
color: gray;
cursor: help;
}
.fa-exclamation-circle:hover{
color: gray;
cursor: help;
}
</style>
HTML;
}
@@ -53,7 +57,7 @@
if ($data->status == 1) {
$status .= '<i class="fas fa-check-circle"></i>';
} else {
$status .= '<i class="fas fa-exclamation-circle"></i>';
$status .= '<i class="fas fa-exclamation-circle" title="The SWAG container can\'t reach '.$result.'"></i>';
}
$status .= '</td><td>';
if (!empty($data->locations)) {
@@ -61,7 +65,12 @@
$location = implode(",", $locations);
$status .= '<i class="fas fa-check-circle"></i></td><td class="left-text"><span class="status-text">'.$location.'</span></td>';
} else {
$status .= '<i class="fas fa-exclamation-circle"></i></td><td></td>';
$error = 'Unable to locate the proxy config for '.$result.', it must use the following structure:'.PHP_EOL;
$error .= '&#09;set $upstream_app <container/address>;'.PHP_EOL;
$error .= '&#09;set $upstream_port <port>;'.PHP_EOL;
$error .= '&#09;set $upstream_proto <protocol>;'.PHP_EOL;
$error .= '&#09;proxy_pass $upstream_proto://$upstream_app:$upstream_port;'.PHP_EOL;
$status .= '<i class="fas fa-exclamation-circle" title="'.$error.'"></i></td><td></td>';
}
$status .= '</tr>';
$index++;
@@ -133,7 +142,7 @@
$output = shell_exec("/etc/cont-init.d/70-templates");
foreach(explode(PHP_EOL, $output) as $line) {
if(substr($line, 0, 1) === "*"){
$tooltip .= str_replace("*", "", $line)."&#013;";
$tooltip .= str_replace("*", "", $line).PHP_EOL;
} elseif(substr($line, 0, 1) === "/") {
$tr_class = ($counter % 2 == 0) ? 'shaded' : '';
$files .= '<tr class="'.$tr_class.'"><td class="left-text"><span class="status-text">'.htmlspecialchars($line).'</span></td>';
@@ -236,8 +245,30 @@
return $goaccess;
}
function GetCertificate() {
$certdate = shell_exec("openssl x509 -in /config/keys/letsencrypt/fullchain.pem -noout -enddate | awk -F '=' '{print \$NF}'");
$certtime = strtotime($certdate);
$certdateshort = date('Y-m-d', $certtime );
if (time() < $certtime) {
$ssl = '<i class="fab fa-lock"></i> SSL certificate valid until '.$certdateshort;
} else {
$ssl = '<i class="fab fa-exclamation-circle" title="Check the container logs for more details"></i> SSL certificate expired on '.$certdateshort;
}
return <<<HTML
<div class="pull-right status-div">
<h4>
<span class="label label-info" style="display:block">
{$ssl}
</span>
</h4>
</div>
HTML;
}
$goaccess = GetGoaccess();
$status = GetHeader() . GetProxies() . GetF2B() . GetTemplates() . GetAnnouncements() . GetLinks() . '<div class="wrap-general">';
$status = GetHeader() . GetProxies() . GetF2B() . GetTemplates() . GetAnnouncements() . GetLinks() . "<div class='wrap-general'>";
$page = str_replace("<div class='wrap-general'>", $status, $goaccess);
$ssl = GetCertificate() . "<div class='pull-right hide'>";
$page = str_replace("<div class='pull-right'>", $ssl, $page);
echo $page;
?>