k3t/nixconf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change blocky port to fix podman, fix a few container files

Browse Source
This commit is contained in:
k3t
2026-07-28 10:03:28 -06:00
parent 6d6b690218
commit f0294a80ce
3 changed files with 62 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/nixcloud/services.d/dns.nix
+1 -1
View File
@@ -12,7 +12,7 @@
prefetching = true; prefetching = true;
}; };
ports = { ports = {
dns = 53; dns = 5353;
tls = 853; tls = 853;
http = 4000; http = 4000;
}; };
hosts/nixcloud/services.d/matrix.d/mautrix.nix
+61 -209
View File
@@ -5,215 +5,67 @@
{ {
# Containers # Containers
virtualisation.oci-containers.containers."matrix-mautrix-bluesky" = { virtualisation.oci-containers.containers = {
image = "dock.mau.dev/mautrix/bluesky:latest"; "matrix-mautrix-bluesky" = {
volumes = [ image = "dock.mau.dev/mautrix/bluesky:latest";
"/var/lib/mautrix/bluesky:/data:rw" volumes = [
]; "/var/lib/mautrix/bluesky:/data:rw"
ports = [ ];
"127.0.0.4:29340:29340/tcp" ports = [
]; "127.0.0.4:29340:29340/tcp"
log-driver = "journald"; ];
extraOptions = [ log-driver = "journald";
"--network-alias=mautrix-bluesky" };
"--network=matrix_default" "matrix-mautrix-discord" = {
]; image = "dock.mau.dev/mautrix/discord:latest";
}; volumes = [
systemd.services."podman-matrix-mautrix-bluesky" = { "/var/lib/mautrix/discord:/data:rw"
serviceConfig = { ];
Restart = lib.mkOverride 90 "always"; ports = [
}; "127.0.0.4:29334:29334/tcp"
after = [ ];
"podman-network-matrix_default.service" log-driver = "journald";
]; };
requires = [ "matrix-mautrix-linkedin" = {
"podman-network-matrix_default.service" image = "dock.mau.dev/mautrix/linkedin:latest";
]; volumes = [
partOf = [ "/var/lib/mautrix/linkedin:/data:rw"
"podman-compose-matrix-root.target" ];
]; ports = [
wantedBy = [ "127.0.0.4:29341:29341/tcp"
"podman-compose-matrix-root.target" ];
]; log-driver = "journald";
}; };
virtualisation.oci-containers.containers."matrix-mautrix-discord" = { "matrix-mautrix-meta" = {
image = "dock.mau.dev/mautrix/discord:latest"; image = "dock.mau.dev/mautrix/meta:latest";
volumes = [ volumes = [
"/var/lib/mautrix/discord:/data:rw" "/var/lib/mautrix/meta:/data:rw"
]; ];
ports = [ ports = [
"127.0.0.4:29334:29334/tcp" "127.0.0.4:29319:29319/tcp"
]; ];
log-driver = "journald"; log-driver = "journald";
extraOptions = [ };
"--network-alias=mautrix-discord" "matrix-mautrix-twitter" = {
"--network=matrix_default" image = "dock.mau.dev/mautrix/twitter:latest";
]; volumes = [
}; "/var/lib/mautrix/twitter:/data:rw"
systemd.services."podman-matrix-mautrix-discord" = { ];
serviceConfig = { ports = [
Restart = lib.mkOverride 90 "always"; "127.0.0.4:29327:29327/tcp"
}; ];
after = [ log-driver = "journald";
"podman-network-matrix_default.service" };
]; "matrix-mautrix-whatsapp" = {
requires = [ image = "dock.mau.dev/mautrix/whatsapp:latest";
"podman-network-matrix_default.service" volumes = [
]; "/var/lib/mautrix/whatsapp:/data:rw"
partOf = [ ];
"podman-compose-matrix-root.target" ports = [
]; "127.0.0.4:29318:29318/tcp"
wantedBy = [ ];
"podman-compose-matrix-root.target" log-driver = "journald";
]; };
};
virtualisation.oci-containers.containers."matrix-mautrix-linkedin" = {
image = "dock.mau.dev/mautrix/linkedin:latest";
volumes = [
"/var/lib/mautrix/linkedin:/data:rw"
];
ports = [
"127.0.0.4:29341:29341/tcp"
];
log-driver = "journald";
extraOptions = [
"--network-alias=mautrix-linkedin"
"--network=matrix_default"
];
};
systemd.services."podman-matrix-mautrix-linkedin" = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
};
after = [
"podman-network-matrix_default.service"
];
requires = [
"podman-network-matrix_default.service"
];
partOf = [
"podman-compose-matrix-root.target"
];
wantedBy = [
"podman-compose-matrix-root.target"
];
};
virtualisation.oci-containers.containers."matrix-mautrix-meta" = {
image = "dock.mau.dev/mautrix/meta:latest";
volumes = [
"/var/lib/mautrix/meta:/data:rw"
];
ports = [
"127.0.0.4:29319:29319/tcp"
];
log-driver = "journald";
extraOptions = [
"--network-alias=mautrix-meta"
"--network=matrix_default"
];
};
systemd.services."podman-matrix-mautrix-meta" = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
};
after = [
"podman-network-matrix_default.service"
];
requires = [
"podman-network-matrix_default.service"
];
partOf = [
"podman-compose-matrix-root.target"
];
wantedBy = [
"podman-compose-matrix-root.target"
];
};
virtualisation.oci-containers.containers."matrix-mautrix-twitter" = {
image = "dock.mau.dev/mautrix/twitter:latest";
volumes = [
"/var/lib/mautrix/twitter:/data:rw"
];
ports = [
"127.0.0.4:29327:29327/tcp"
];
log-driver = "journald";
extraOptions = [
"--network-alias=mautrix-twitter"
"--network=matrix_default"
];
};
systemd.services."podman-matrix-mautrix-twitter" = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
};
after = [
"podman-network-matrix_default.service"
];
requires = [
"podman-network-matrix_default.service"
];
partOf = [
"podman-compose-matrix-root.target"
];
wantedBy = [
"podman-compose-matrix-root.target"
];
};
virtualisation.oci-containers.containers."matrix-mautrix-whatsapp" = {
image = "dock.mau.dev/mautrix/whatsapp:latest";
volumes = [
"/var/lib/mautrix/whatsapp:/data:rw"
];
ports = [
"127.0.0.4:29318:29318/tcp"
];
log-driver = "journald";
extraOptions = [
"--network-alias=mautrix-whatsapp"
"--network=matrix_default"
];
};
systemd.services."podman-matrix-mautrix-whatsapp" = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
};
after = [
"podman-network-matrix_default.service"
];
requires = [
"podman-network-matrix_default.service"
];
partOf = [
"podman-compose-matrix-root.target"
];
wantedBy = [
"podman-compose-matrix-root.target"
];
}; };
# Networks
systemd.services."podman-network-matrix_default" = {
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStop = "podman network rm -f matrix_default";
};
script = ''
podman network inspect matrix_default || podman network create matrix_default
'';
partOf = [ "podman-compose-matrix-root.target" ];
wantedBy = [ "podman-compose-matrix-root.target" ];
};
# Root service
# When started, this will automatically create all resources and start
# the containers. When stopped, this will teardown all resources.
systemd.targets."podman-compose-matrix-root" = {
unitConfig = {
Description = "Root target generated by compose2nix.";
};
wantedBy = [ "multi-user.target" ];
};
} }
hosts/nixcloud/services.d/minecraft.nix
-78
View File
@@ -1,7 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
virtualisation.oci-containers.containers."minecraft-server" = { virtualisation.oci-containers.containers."minecraft-server" = {
image = "ghcr.io/graalvm/graalvm-community:25"; image = "ghcr.io/graalvm/graalvm-community:25";
volumes = [ volumes = [
@@ -12,87 +11,10 @@
"24454:24454/udp" "24454:24454/udp"
]; ];
extraOptions = [ extraOptions = [
"--network-alias=minecraft-server"
"--network=minecraft_default"
"--tty" "--tty"
"--interactive" "--interactive"
]; ];
entrypoint = "/data/run.sh"; entrypoint = "/data/run.sh";
log-driver = "journald"; log-driver = "journald";
}; };
systemd.services."podman-minecraft-server" = {
serviceConfig = {
Restart = lib.mkOverride 90 "always";
};
after = [
"podman-network-minecraft_default.service"
];
requires = [
"podman-network-minecraft_default.service"
];
partOf = [
"podman-compose-minecraft-root.target"
];
wantedBy = [
"podman-compose-minecraft-root.target"
];
};
# Networks
systemd.services."podman-network-minecraft_default" = {
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStop = "podman network rm -f minecraft_default";
};
script = ''
podman network inspect minecraft_default || podman network create minecraft_default
'';
partOf = [ "podman-compose-minecraft-root.target" ];
wantedBy = [ "podman-compose-minecraft-root.target" ];
};
# Root service
# When started, this will automatically create all resources and start
# the containers. When stopped, this will teardown all resources.
systemd.targets."podman-compose-minecraft-root" = {
unitConfig = {
Description = "Root target";
};
wantedBy = [ "multi-user.target" ];
};
#systemd.services.minecraft-container = {
# description = "Minecraft Server Container (GraalVM JVM 25)";
# after = [ "network-online.target" ];
# wants = [ "network-online.target" ];
# serviceConfig = {
# ExecStart = ''
# ${pkgs.podman}/bin/podman run \
# --rm \
# --name minecraft-server \
# -v /var/lib/minecraft:/data \
# -p 25565:25565 \
# -p 24454:24454/udp \
# ghcr.io/graalvm/graalvm-community:25 \
# /data/run.sh
# '';
# ExecStop = "${pkgs.podman}/bin/podman stop minecraft-server";
# Restart = "always";
# RestartSec = "10s";
# };
#
# # Ensure the directory exists
# preStart = ''
# mkdir -p /var/lib/minecraft
# '';
# wantedBy = [ "multi-user.target" ];
#};
#
## Give Podman permission to access persistent storage
#systemd.tmpfiles.rules = [
# "d /var/lib/minecraft 0755 root root"
#];
} }