Update Reverse proxy and TLS configuration on Caddy
This commit is contained in:
@@ -6,6 +6,7 @@ import BunSQLite from "@moduletrace/bun-sqlite";
|
||||
import type { TableType } from "@/src/types";
|
||||
import { TlsData } from "@/src/data/tls-data";
|
||||
import grabCaddyStatus from "../caddy/grab-caddy-status";
|
||||
import grabCaddySettings from "../caddy/grab-caddy-settings";
|
||||
import grabCertDirNames from "../caddy/grab-cert-dir-names";
|
||||
import readAcmeEnv from "./read-acme-env";
|
||||
import readCertificateExpiry from "./read-certificate-expiry";
|
||||
@@ -95,8 +96,10 @@ export default async function grabTlsStatus() {
|
||||
(a.hostname || "").localeCompare(b.hostname || ""),
|
||||
);
|
||||
|
||||
const settings = await grabCaddySettings();
|
||||
|
||||
return {
|
||||
caddy: grabCaddyStatus(),
|
||||
caddy: grabCaddyStatus(settings),
|
||||
certificates,
|
||||
acme: {
|
||||
env_path: acme_env.exists ? `/etc/wgui/acme.env` : null,
|
||||
@@ -112,6 +115,8 @@ export default async function grabTlsStatus() {
|
||||
),
|
||||
staging: TlsData.AcmeStaging,
|
||||
},
|
||||
https_port: TlsData.CaddyHttpsPort,
|
||||
https_port: settings.https_port,
|
||||
http_port: settings.http_port,
|
||||
redirect: settings.redirect,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user