matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(docker): force global dns and update jfa
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-07-28 00:44:09 -04:00
parent a8a278202c
commit 8ebc6de43e
5 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devices/nos/modules/docker/wg-easy/compose.nix
View file

@ -25,8 +25,6 @@ in {
"net.ipv4.conf.all.src_valid_mark=1" "net.ipv4.conf.all.src_valid_mark=1"
]; ];
dns = ["1.0.0.1"];
environment = { environment = {
WG_HOST = "166.62.179.208"; WG_HOST = "166.62.179.208";
WG_PORT = "51820"; WG_PORT = "51820";

4
devices/nos/modules/jellyfin/images/jfa-go.nix
View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage { pkgs.dockerTools.pullImage {
imageName = "hrfee/jfa-go"; imageName = "hrfee/jfa-go";
imageDigest = "sha256:e50d74379d91f9389afcd7db6bc4542ad2b1869f4af69c7f9fb5f9c02e7957da"; imageDigest = "sha256:96b4744c1bbb25561e40121fc2132f96c08c569fdd9235d5de79e658a2682d88";
sha256 = "02v0p4yrp4gjm88mqvdasaslfl51r194m6fj08bmq16bm6zz1n9l"; sha256 = "0payy2warh81rkry49n7kh07088jxkb8lgans8rlpq8vf69xmqlp";
finalImageName = "hrfee/jfa-go"; finalImageName = "hrfee/jfa-go";
finalImageTag = "unstable"; finalImageTag = "unstable";
} }

7
devices/nos/modules/jellyfin/jfa-go.nix
View file

@ -10,15 +10,20 @@ in {
partOf = ["jellyfin.service"]; partOf = ["jellyfin.service"];
}; };
khepri.compositions."jfa-go".services."jfa-go" = { khepri.compositions."jfa-go" = {
networks.proxy_net = {external = true;};
services."jfa-go" = {
image = import ./images/jfa-go.nix pkgs; image = import ./images/jfa-go.nix pkgs;
restart = "always"; restart = "always";
ports = ["8056:8056"]; ports = ["8056:8056"];
networks = ["proxy_net"];
volumes = [ volumes = [
"${jellyService.WorkingDirectory}/jfa-go:/data" "${jellyService.WorkingDirectory}/jfa-go:/data"
"/etc/localtime:/etc/localtime:ro" "/etc/localtime:/etc/localtime:ro"
]; ];
}; };
};
} }

BIN
flake.lock
View file

Binary file not shown.

5
modules/docker/default.nix
View file

@ -28,7 +28,12 @@ in {
docker = { docker = {
enable = true; enable = true;
storageDriver = "btrfs"; storageDriver = "btrfs";
package = pkgs.docker_27;
daemon.settings.dns = ["8.8.8.8" "1.1.1.1"];
}; };
# khepri uses oci-containers under the hood and it must be set to docker to work # khepri uses oci-containers under the hood and it must be set to docker to work
oci-containers.backend = "docker"; oci-containers.backend = "docker";
}; };