servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add matrix-rtc #1

Merged
servius merged 6 commits from matrix-rtc into master 2026-02-23 19:42:07 +08:00
Conversation 0 Commits 6 Files Changed 6 +25 -29
2 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bbeed99f43 - Show all commits

52
modules/nixos/affine.nix
View File

@@ -67,12 +67,12 @@ in {
}; };
environmentFiles = cfg.environmentFiles; environmentFiles = cfg.environmentFiles;
extraOptions = [ extraOptions = [
"--network=affine-net"
"--health-cmd=pg_isready -U ${dbUser} -d ${dbName}" "--health-cmd=pg_isready -U ${dbUser} -d ${dbName}"
"--health-interval=10s" "--health-interval=10s"
"--health-timeout=5s" "--health-timeout=5s"
"--health-retries=5" "--health-retries=5"
]; ];
networks = ["affine-net"];
}; };
affine-redis = { affine-redis = {
@@ -80,8 +80,8 @@ in {
volumes = [ volumes = [
"${cfg.dataDir}/redis:/data" "${cfg.dataDir}/redis:/data"
]; ];
networks = ["affine-net"];
extraOptions = [ extraOptions = [
"--network=affine-net"
"--health-cmd=redis-cli --raw incr ping" "--health-cmd=redis-cli --raw incr ping"
"--health-interval=10s" "--health-interval=10s"
"--health-timeout=5s" "--health-timeout=5s"
@@ -111,9 +111,7 @@ in {
AFFINE_INDEXER_ENABLED = "false"; AFFINE_INDEXER_ENABLED = "false";
}; };
environmentFiles = cfg.environmentFiles; environmentFiles = cfg.environmentFiles;
extraOptions = [ networks = ["affine-net"];
"--network=affine-net"
];
}; };
affine-migration = { affine-migration = {
@@ -133,34 +131,32 @@ in {
AFFINE_INDEXER_ENABLED = "false"; AFFINE_INDEXER_ENABLED = "false";
}; };
environmentFiles = cfg.environmentFiles; environmentFiles = cfg.environmentFiles;
extraOptions = [ networks = ["affine-net"];
"--network=affine-net"
];
}; };
}; };
}; };
# Create the Docker network # Create the Docker network
systemd.services.affine-network = { # systemd.services.affine-network = {
description = "Create AFFiNE Docker network"; # description = "Create AFFiNE Docker network";
after = ["docker.service"]; # after = ["docker.service"];
wantedBy = ["multi-user.target"]; # wantedBy = ["multi-user.target"];
serviceConfig = { # serviceConfig = {
Type = "oneshot"; # Type = "oneshot";
RemainAfterExit = true; # RemainAfterExit = true;
ExecStart = "${config.virtualisation.docker.package}/bin/docker network create affine-net"; # # ExecStart = "${config.virtualisation.docker.package}/bin/docker network create affine-net";
ExecStop = "${config.virtualisation.docker.package}/bin/docker network remove affine-net"; # # ExecStop = "${config.virtualisation.docker.package}/bin/docker network remove affine-net";
}; # };
}; # };
#
# Ensure containers start after the network is created # Ensure containers start after the network is created
systemd.services.docker-affine.after = ["affine-network.service"]; # systemd.services.docker-affine.after = ["affine-network.service"];
systemd.services.docker-affine.requires = ["affine-network.service"]; # systemd.services.docker-affine.requires = ["affine-network.service"];
systemd.services.docker-affine-postgres.after = ["affine-network.service"]; # systemd.services.docker-affine-postgres.after = ["affine-network.service"];
systemd.services.docker-affine-postgres.requires = ["affine-network.service"]; # systemd.services.docker-affine-postgres.requires = ["affine-network.service"];
systemd.services.docker-affine-redis.after = ["affine-network.service"]; # systemd.services.docker-affine-redis.after = ["affine-network.service"];
systemd.services.docker-affine-redis.requires = ["affine-network.service"]; # systemd.services.docker-affine-redis.requires = ["affine-network.service"];
systemd.services.docker-affine-migration.after = ["affine-network.service"]; # systemd.services.docker-affine-migration.after = ["affine-network.service"];
systemd.services.docker-affine-migration.requires = ["affine-network.service"]; # systemd.services.docker-affine-migration.requires = ["affine-network.service"];
}; };
} }

2
nixos/tako/services/default.nix
View File

@@ -13,7 +13,7 @@
./tailscale.nix ./tailscale.nix
./gitea.nix ./gitea.nix
./affine.nix # ./affine.nix
./attic.nix ./attic.nix
./excalidraw.nix ./excalidraw.nix
./flaresolverr.nix ./flaresolverr.nix