greg/nixos
1
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of gh:greg-hellings/nixos-config

Browse Source
This commit is contained in:
Greg Hellings
2024-07-23 14:27:15 -05:00
parent 51a7db4a13 2df3ae75c6
commit 17358a5ca5
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/myself/container-git.nix
+9 -14
View File
@@ -177,23 +177,18 @@ in {
# Do not start nginx until we have tailscaled up and running, so it can bind # Do not start nginx until we have tailscaled up and running, so it can bind
# to the 100.* addresses # to the 100.* addresses
systemd.services.nginx = { systemd.services = {
nginx = rec {
after = [ after = [
"tailscaled.service"
"network.target"
"network-online.target" "network-online.target"
]; ];
wants = [ wants = after;
"tailscaled.service" serviceConfig = {
"network.target" RestartMaxDelaySec = "30s";
"network-online.target" RestartSteps = "5";
]; };
requires = [ };
"tailscaled.service" tailscaled.partOf = [ "network-online.target" ];
];
preStart = ''
sleep 5 # tailscaled is up before it's ACTUALLY up... try waiting?
'';
}; };
system.stateVersion = lib.mkForce "24.05"; system.stateVersion = lib.mkForce "24.05";
} }