From 0e3858b5e5bb5717319c5a17fb195c51f1cbf06c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 18 Sep 2021 17:44:40 +0300 Subject: refactor(whitby): Move restic path configuration into modules This lets each service declare their backup paths together with the configuration for the service, which is a lot more sensible than what we had before. Fixes b/147 Change-Id: If76fe62639f4cc0e6fbb63a2959d584479d8f0fb Reviewed-on: https://cl.tvl.fyi/c/depot/+/3583 Tested-by: BuildkiteCI Reviewed-by: sterni --- ops/machines/whitby/default.nix | 7 ------- ops/modules/git-serving.nix | 1 + ops/modules/monorepo-gerrit.nix | 5 +++++ ops/modules/www/deploys.tvl.fyi.nix | 2 ++ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index d59900776c..7cc529c7f8 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -331,16 +331,9 @@ in { enable = true; paths = [ "/var/backup/postgresql" - "/var/html/deploys.tvl.fyi" - "/var/lib/gerrit" "/var/lib/grafana" - "/var/lib/josh" "/var/lib/znc" ]; - - exclude = [ - "/var/lib/gerrit/tmp" - ]; }; }; diff --git a/ops/modules/git-serving.nix b/ops/modules/git-serving.nix index 7601ba1d61..3095606143 100644 --- a/ops/modules/git-serving.nix +++ b/ops/modules/git-serving.nix @@ -50,5 +50,6 @@ in { }; }; + services.depot.restic.paths = [ "/var/lib/josh" ]; }; } diff --git a/ops/modules/monorepo-gerrit.nix b/ops/modules/monorepo-gerrit.nix index d4b37d860b..69850fa15a 100644 --- a/ops/modules/monorepo-gerrit.nix +++ b/ops/modules/monorepo-gerrit.nix @@ -135,4 +135,9 @@ in { Group = "git"; }; }; + + services.depot.restic = { + paths = [ "/var/lib/gerrit" ]; + exclude = [ "/var/lib/gerrit/tmp" ]; + }; } diff --git a/ops/modules/www/deploys.tvl.fyi.nix b/ops/modules/www/deploys.tvl.fyi.nix index 8ae06f2fff..ffbe225b58 100644 --- a/ops/modules/www/deploys.tvl.fyi.nix +++ b/ops/modules/www/deploys.tvl.fyi.nix @@ -16,5 +16,7 @@ forceSSL = true; root = "/var/html/deploys.tvl.fyi"; }; + + services.depot.restic.paths = [ "/var/html/deploys.tvl.fyi" ]; }; } -- cgit 1.4.1