thohlt/archtika
1
0
Fork 0
mirror of https://github.com/thiloho/archtika.git synced 2025-11-22 02:41:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable wildcard domains for published websites

Browse Source
This commit is contained in:
thiloho
2024-08-18 13:48:36 +02:00
parent 211b518b72
commit 5accbb4283
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nix/module.nix
View File

@@ -130,7 +130,7 @@ in
virtualHosts = {
"demo.archtika.com" = {
enableACME = true;
useACMEHost = "demo.archtika.com";
forceSSL = true;
locations = {
"/" = {
@@ -156,12 +156,30 @@ in
};
};
};
"~^(?<subdomain>.+)\\.demo\\.archtika\\.com$" = {
useACMEHost = "demo.archtika.com";
forceSSL = true;
locations = {
"/" = {
alias = "/var/www/archtika-websites/$subdomain/";
index = "index.html";
tryFiles = "$uri $uri/ $uri/index.html =404";
};
};
};
};
};
security.acme = {
acceptTerms = true;
defaults.email = "thilo.hohlt@tutanota.com";
certs."demo.archtika.com" = {
domain = "demo.archtika.com";
extraDomainNames = ["*.demo.archtika.com"];
dnsProvider = "porkbun";
environmentFile = /var/lib/porkbun.env;
group = config.services.nginx.group;
};
};
};
}

16
web-app/src/routes/(authenticated)/website/[websiteId]/publish/+page.server.ts
View File

@@ -24,7 +24,7 @@ export const load: PageServerLoad = async ({ params, fetch, cookies }) => {
generateStaticFiles(websiteOverview);
const websitePreviewUrl = `${NGINX_BASE_PREFIX}/previews/${websiteOverview.user_id}/${websiteOverview.id}/index.html`;
const websitePreviewUrl = `${NGINX_BASE_PREFIX}/previews/${websiteOverview.id}/index.html`;
return {
websiteOverview,
@@ -60,17 +60,9 @@ const generateStaticFiles = async (websiteData: any, isPreview: boolean = true)
let uploadDir = "";
if (isPreview) {
uploadDir = join(
"/",
"var",
"www",
"archtika-websites",
"previews",
websiteData.user_id,
websiteData.id
);
uploadDir = join("/", "var", "www", "archtika-websites", "previews", websiteData.id);
} else {
uploadDir = join("/", "var", "www", "archtika-websites", websiteData.user_id, websiteData.id);
uploadDir = join("/", "var", "www", "archtika-websites", websiteData.id);
}
await mkdir(uploadDir, { recursive: true });
@@ -86,7 +78,7 @@ const generateStaticFiles = async (websiteData: any, isPreview: boolean = true)
logoType: websiteData.logo_type,
logo: websiteData.logo_text,
coverImage: article.cover_image
? `${API_BASE_PREFIX}/rpc/retrieve_file?id=${article.cover_image}`
? `${API_BASE_PREFIX === "/api" ? "https://demo.archtika.com/api" : API_BASE_PREFIX}/rpc/retrieve_file?id=${article.cover_image}`
: "",
publicationDate: article.publication_date,
mainContent: md.render(article.main_content ?? ""),