Compare commits

...

2 Commits

5 changed files with 25 additions and 4 deletions

View File

@@ -17,12 +17,14 @@ in
TUWUNEL_REGISTRATION_TOKEN=${config.sops.placeholder."matrix/blazestar-registration-token"} TUWUNEL_REGISTRATION_TOKEN=${config.sops.placeholder."matrix/blazestar-registration-token"}
''; '';
# This isn't using any of my usual helpers because I wanted to set a custom
# serviceName in Traefik that is different from the hostname to avoid
# conflicts with the havenisms.com server.
virtualisation.oci-containers.containers."${serviceName}" = { virtualisation.oci-containers.containers."${serviceName}" = {
# The 1.1.0 version has an issue with the compression being incorrectly tagged. # The 1.1.0 version has an issue with the compression being incorrectly tagged.
# See: https://github.com/matrix-construct/tuwunel/issues/79 # See: https://github.com/matrix-construct/tuwunel/issues/79
image = "ghcr.io/matrix-construct/tuwunel:v1.0.0-release-all-x86_64-linux-gnu"; image = "ghcr.io/matrix-construct/tuwunel:v1.0.0-release-all-x86_64-linux-gnu";
autoStart = true; autoStart = true;
hostname = "${matrixHost}.${blazestar}";
volumes = [ volumes = [
"matrix-blazestar-net-db:${dbPath}" "matrix-blazestar-net-db:${dbPath}"
]; ];

View File

@@ -2,5 +2,6 @@
{ {
imports = [ imports = [
./chat.nix ./chat.nix
./uptime.nix
]; ];
} }

View File

@@ -0,0 +1,15 @@
{ config, ... }:
let
inherit (import ../lib.nix config) blazestar;
in
{
virtualisation.web-containers.containers.uptime = {
image = "louislam/uptime-kuma:1";
hostname = "uptime";
domain = blazestar;
port = 3001;
volumes = [
"uptime-kuma:/app/data"
];
};
}

View File

@@ -38,11 +38,11 @@ in
virtualisation.oci-containers.containers = virtualisation.oci-containers.containers =
mkStaticSite { mkStaticSite {
host = terakoda; host = terakoda;
dir = "dist"; dir = "deployed";
} }
// mkStaticSite { // mkStaticSite {
host = blazestar; host = blazestar;
dir = "dist"; dir = "deployed";
} }
// mkStaticSite { // mkStaticSite {
host = havenisms; host = havenisms;

View File

@@ -28,6 +28,8 @@ let
id id
pwd pwd
output_dir=$(date --utc --iso-8601=seconds)
export GIT_SSH_COMMAND='ssh -v -o "UserKnownHostsFile ${gitKnownHosts}" -i "${ export GIT_SSH_COMMAND='ssh -v -o "UserKnownHostsFile ${gitKnownHosts}" -i "${
config.sops.secrets."deploy-key/mcp".path config.sops.secrets."deploy-key/mcp".path
}"' }"'
@@ -43,7 +45,8 @@ let
# Use a local cache with --cache .npm # Use a local cache with --cache .npm
npm ci --cache .npm npm ci --cache .npm
npm run build npm run build -- --outDir "$output_dir"
ln -s "$output_dir" deployed
''; '';
}; };
in in