From 536e01e9672253991ec86289f7a75f182782613a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 17 Feb 2022 13:36:57 +0300 Subject: refactor(ops/modules): Move journaldriver configuration into module This makes the journaldriver configuration machine-independent. The secret is loaded from agenix instead of being persisted on disk. Change-Id: I592ae7f5726fcb7f37a406f69dcf5ac498eeb1b7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5302 Autosubmit: tazjin Tested-by: BuildkiteCI Reviewed-by: sterni --- ops/machines/whitby/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'ops/machines/whitby') diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index 1d0096abff..9f1a0a1914 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -13,6 +13,7 @@ in "${depot.path}/ops/modules/gerrit-queue.nix" "${depot.path}/ops/modules/irccat.nix" "${depot.path}/ops/modules/josh.nix" + "${depot.path}/ops/modules/journaldriver.nix" "${depot.path}/ops/modules/known-hosts.nix" "${depot.path}/ops/modules/monorepo-gerrit.nix" "${depot.path}/ops/modules/nixery.nix" @@ -481,13 +482,6 @@ in ops.deploy-whitby ]); - services.journaldriver = { - enable = true; - googleCloudProject = "tvl-fyi"; - logStream = "whitby"; - applicationCredentials = "/var/lib/journaldriver/key.json"; - }; - # Required for prometheus to be able to scrape stats services.nginx.statusPage = true; -- cgit 1.4.1