diff options
-rw-r--r-- | hosts/sif/default.nix | 21 | ||||
-rw-r--r-- | hosts/vidhar/borg/default.nix | 6 |
2 files changed, 25 insertions, 2 deletions
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index 58f99b9a..0d12c6cc 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix | |||
@@ -76,6 +76,27 @@ in { | |||
76 | }; | 76 | }; |
77 | }; | 77 | }; |
78 | 78 | ||
79 | services.timesyncd.enable = false; | ||
80 | services.chrony = { | ||
81 | enable = true; | ||
82 | servers = []; | ||
83 | extraConfig = '' | ||
84 | pool time.cloudflare.com iburst nts | ||
85 | pool nts.ntp.se iburst nts | ||
86 | server nts.sth1.ntp.se iburst nts | ||
87 | server nts.sth2.ntp.se iburst nts | ||
88 | server ptbtime1.ptb.de iburst nts | ||
89 | server ptbtime2.ptb.de iburst nts | ||
90 | server ptbtime3.ptb.de iburst nts | ||
91 | |||
92 | leapsectz right/UTC | ||
93 | |||
94 | makestep 0.1 3 | ||
95 | |||
96 | cmdport 0 | ||
97 | ''; | ||
98 | }; | ||
99 | |||
79 | networking = { | 100 | networking = { |
80 | domain = "yggdrasil"; | 101 | domain = "yggdrasil"; |
81 | search = [ "yggdrasil" ]; | 102 | search = [ "yggdrasil" ]; |
diff --git a/hosts/vidhar/borg/default.nix b/hosts/vidhar/borg/default.nix index 80ce9c7e..5e983434 100644 --- a/hosts/vidhar/borg/default.nix +++ b/hosts/vidhar/borg/default.nix | |||
@@ -26,9 +26,11 @@ let | |||
26 | Type = "oneshot"; | 26 | Type = "oneshot"; |
27 | ExecStart = "${pkgs.borgbackup}/bin/borg ${utils.escapeSystemdExecArgs [ | 27 | ExecStart = "${pkgs.borgbackup}/bin/borg ${utils.escapeSystemdExecArgs [ |
28 | "--lock-wait" "3600" | 28 | "--lock-wait" "3600" |
29 | "--log-json" | ||
29 | "--progress" | 30 | "--progress" |
30 | "check" | 31 | "check" |
31 | "--verify-data" | 32 | "--verify-data" |
33 | "--max-duration" "4500" | ||
32 | ]} %I"; | 34 | ]} %I"; |
33 | Environment = [ | 35 | Environment = [ |
34 | "BORG_BASE_DIR=/var/lib/borg" | 36 | "BORG_BASE_DIR=/var/lib/borg" |
@@ -80,13 +82,13 @@ in { | |||
80 | systemd.timers."check-borg@${utils.escapeSystemdPath "/srv/backup/borg/jotnar"}" = { | 82 | systemd.timers."check-borg@${utils.escapeSystemdPath "/srv/backup/borg/jotnar"}" = { |
81 | wantedBy = [ "timers.target" ]; | 83 | wantedBy = [ "timers.target" ]; |
82 | timerConfig = { | 84 | timerConfig = { |
83 | OnCalendar = "Sun *-*-02..08 01:30:00 Europe/Berlin"; | 85 | OnCalendar = "*-*-* 00:30:00 UTC"; |
84 | }; | 86 | }; |
85 | }; | 87 | }; |
86 | systemd.timers."check-borg@${utils.escapeSystemdPath "yggdrasil.borgbase:repo"}" = { | 88 | systemd.timers."check-borg@${utils.escapeSystemdPath "yggdrasil.borgbase:repo"}" = { |
87 | wantedBy = [ "timers.target" ]; | 89 | wantedBy = [ "timers.target" ]; |
88 | timerConfig = { | 90 | timerConfig = { |
89 | OnCalendar = "Sun *-*-02..08 01:30:00 Europe/Berlin"; | 91 | OnCalendar = "*-*-* 00:30:00 UTC"; |
90 | }; | 92 | }; |
91 | }; | 93 | }; |
92 | 94 | ||