Periodic/system-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[terakoda.com] Moves www2 to the main site.

Browse Source
This commit is contained in:
Drew Haven
2025-06-09 16:04:08 -07:00
parent d432ef8014
commit 6601377ece
2 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
system/hosts/mcp/containers/public-homepage.nix
View File

@@ -7,7 +7,10 @@ let
blazestar blazestar
; ;
mkStaticSite = mkStaticSite =
host: {
host,
dir ? "public",
}:
let let
cleanHost = lib.strings.stringAsChars (c: if c == "." then "-" else c) host; cleanHost = lib.strings.stringAsChars (c: if c == "." then "-" else c) host;
in in
@@ -16,7 +19,7 @@ let
image = "nginx:alpine"; image = "nginx:alpine";
autoStart = true; autoStart = true;
volumes = [ volumes = [
"/tank/web/${host}/public:/usr/share/nginx/html:ro" "/tank/web/${host}/${dir}:/usr/share/nginx/html:ro"
]; ];
labels = { labels = {
"traefik.enable" = "true"; "traefik.enable" = "true";
@@ -33,27 +36,10 @@ let
in in
{ {
virtualisation.oci-containers.containers = virtualisation.oci-containers.containers =
mkStaticSite terakoda mkStaticSite {
// mkStaticSite havenisms host = terakoda;
// mkStaticSite blazestar dir = "dist";
// ( }
let // mkStaticSite { host = havenisms; }
host = "www2.terakoda.com"; // mkStaticSite { host = blazestar; };
cleanHost = lib.strings.stringAsChars (c: if c == "." then "-" else c) host;
in
{
"${cleanHost}-static" = {
image = "nginx:alpine";
autoStart = true;
volumes = [
"/tank/web/www2.terakoda.com/dist:/usr/share/nginx/html:ro"
];
labels = {
"traefik.enable" = "true";
"traefik.http.routers.${cleanHost}.rule" = "Host(`${host}`)";
"traefik.http.services.${cleanHost}.loadbalancer.server.port" = "80";
};
};
}
);
} }

9
system/hosts/mcp/static-site-hooks.nix
View File

@@ -38,9 +38,6 @@ let
}; };
in in
{ {
# [ ] Make sure the hook can operate on that directory
# [ ] Run the build command
sops.secrets = { sops.secrets = {
"deploy-key/terakoda.com" = { "deploy-key/terakoda.com" = {
restartUnits = [ "webhook.service" ]; restartUnits = [ "webhook.service" ];
@@ -54,10 +51,10 @@ in
port = 9000; port = 9000;
openFirewall = true; openFirewall = true;
hooks = { hooks = {
"deploy-www2-terakoda-com" = { "deploy-terakoda-com" = {
id = "deploy-www2-terakoda-com"; id = "deploy-terakoda-com";
http-methods = [ "POST" ]; http-methods = [ "POST" ];
command-working-directory = "/tank/web/www2.terakoda.com"; command-working-directory = "/tank/web/terakoda.com";
include-command-output-in-response-on-error = true; include-command-output-in-response-on-error = true;
execute-command = "${testHook}/bin/deploy-astro-app"; execute-command = "${testHook}/bin/deploy-astro-app";
trigger-rule-mismatch-http-response-code = 400; trigger-rule-mismatch-http-response-code = 400;