Skip to content

fix: certificate.yml not discovered by Traefik file provider, breaks manually uploaded certs (#4707) #4711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mubashir-teapot wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

fix: certificate.yml not discovered by Traefik file provider, breaks manually uploaded certs (#4707) #4711

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions packages/server/src/services/certificate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,25 @@ export const createCertificate = async (

export const removeCertificateById = async (certificateId: string) => {
const certificate = await findCertificateById(certificateId);
const { CERTIFICATES_PATH } = paths(!!certificate.serverId);
const { CERTIFICATES_PATH, DYNAMIC_TRAEFIK_PATH } = paths(
!!certificate.serverId,
);
const certDir = path.join(CERTIFICATES_PATH, certificate.certificatePath);
const configFile = path.join(
DYNAMIC_TRAEFIK_PATH,
`${certificate.certificatePath}.yml`,
);

if (certificate.serverId) {
await execAsyncRemote(certificate.serverId, `rm -rf ${certDir}`);
await execAsyncRemote(
certificate.serverId,
`rm -rf ${certDir}; rm -f ${configFile}`,
);
} else {
await removeDirectoryIfExistsContent(certDir);
if (fs.existsSync(configFile)) {
fs.rmSync(configFile);
}
}

const result = await db
Expand All @@ -84,7 +96,9 @@ export const removeCertificateById = async (certificateId: string) => {
};

const createCertificateFiles = async (certificate: Certificate) => {
const { CERTIFICATES_PATH } = paths(!!certificate.serverId);
const { CERTIFICATES_PATH, DYNAMIC_TRAEFIK_PATH } = paths(
!!certificate.serverId,
);
const certDir = path.join(CERTIFICATES_PATH, certificate.certificatePath);
const crtPath = path.join(certDir, "chain.crt");
const keyPath = path.join(certDir, "privkey.key");
Expand All @@ -102,7 +116,12 @@ const createCertificateFiles = async (certificate: Certificate) => {
},
};
const yamlConfig = stringify(traefikConfig);
const configFile = path.join(certDir, "certificate.yml");
// Traefik's file provider does not watch subdirectories, so the pointer
// config must live at the top level alongside other dynamic configs.
const configFile = path.join(
DYNAMIC_TRAEFIK_PATH,
`${certificate.certificatePath}.yml`,
);

if (certificate.serverId) {
const certificateData = encodeBase64(certificate.certificateData);
Expand Down