smarter caddy

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+	"workbench.colorTheme": "Userscape Contrast (rainglow)"
+}

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "deployer2",
 	"scripts": {
-		"build": "bun run src/buildSelf.ts",
+		"deploy-self": "bun run src/scripts/deploySelf.ts",
 		"dev": "NODE_ENV=development PORT=6001 bun run --hot src/index.ts",
-		"start": "NODE_ENV=production bun run src/index.ts",
+		"build": "bun run src/scripts/reloadCaddy.ts",
-		"deploy-self": "bun run src/deploySelf.ts"
+		"start": "NODE_ENV=production bun run src/index.ts"
 	},
 	"dependencies": {
 		"@types/object-hash": "^3.0.6",

src/buildSelf.ts

@@ -1,13 +0,0 @@
-import fs from "fs";
-import { indexedConfig } from "./config";
-
-const Caddyfile = Object.values(indexedConfig)
-	.map(
-		({ host, port }) => `
-${host}.drm.dev {
-    reverse_proxy localhost:${port}
-}`
-	)
-	.join("\n");
-
-fs.writeFileSync("Caddyfile", Caddyfile);

src/caddy.ts

@@ -0,0 +1,23 @@
+import fs from "fs";
+import { indexedConfig, config } from "./config";
+import path from "path";
+
+export const reloadCaddyfile = () => {
+	const caddyfilePath = (host: string) =>
+		path.join(config.directory, host, "src", "Caddyfile");
+
+	const Caddyfile = Object.values(indexedConfig)
+		.map(
+			({ host, port }) => `
+${host}.drm.dev {
+	${
+		fs.existsSync(caddyfilePath(host))
+			? `import ${caddyfilePath(host)} ` // <-- space at end important
+			: `reverse_proxy localhost:`
+	}${port}
+}`
+		)
+		.join("\n");
+
+	fs.writeFileSync("Caddyfile", Caddyfile);
+};

src/deploy.ts

@@ -2,6 +2,8 @@ import hash from "object-hash";
 import { $ } from "bun";
 import path from "path";
 import { config, indexedConfig } from "./config";
+import fs from "fs";
+import { reloadCaddyfile } from "./caddy";
 
 type DeployInstance = {
 	host: string;
@@ -31,6 +33,7 @@ export const deploy = async ({ host, commitHash }: DeployInstance) => {
 
 	// Build
 	await $`make build`;
+	reloadCaddyfile();
 
 	// Register service
 	const systemdServiceName = `deployer2-${host}.service`;

src/scripts/deploySelf.ts

@@ -1,4 +1,4 @@
-import { deploy } from "./deploy";
+import { deploy } from "../deploy";
 
 await deploy({
 	host: "deployer2",

src/scripts/reloadCaddy.ts

@@ -0,0 +1,3 @@
+import { reloadCaddyfile } from "../caddy";
+
+reloadCaddyfile();