From 66a6d5096042ecb2861ec57eea87027319c4d957 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Thu, 30 Sep 2021 13:39:10 +0000
Subject: [PATCH] Grafana environment: Adhere to file naming conventions
---
.../{grafanaEnvironment => grafana-environment} | 0
morph/lib/customize-monitoring.nix | 6 +++---
nixos/modules/monitoring/server/grafana.nix | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename morph/grid/local/private-keys/{grafanaEnvironment => grafana-environment} (100%)
diff --git a/morph/grid/local/private-keys/grafanaEnvironment b/morph/grid/local/private-keys/grafana-environment
similarity index 100%
rename from morph/grid/local/private-keys/grafanaEnvironment
rename to morph/grid/local/private-keys/grafana-environment
diff --git a/morph/lib/customize-monitoring.nix b/morph/lib/customize-monitoring.nix
index 8faffad2..409e59df 100644
--- a/morph/lib/customize-monitoring.nix
+++ b/morph/lib/customize-monitoring.nix
@@ -80,9 +80,9 @@ in {
if !enableSlackAlert
then {}
else {
- "grafanaEnvironment" = {
- source = "${privateKeyPath}/grafanaEnvironment";
- destination = "/run/keys/grafanaEnvironment";
+ "grafana-environment" = {
+ source = "${privateKeyPath}/grafana-environment";
+ destination = "/run/keys/grafana-environment";
owner.user = config.systemd.services.grafana.serviceConfig.User;
owner.group = config.users.users.grafana.group;
permissions = "0400";
diff --git a/nixos/modules/monitoring/server/grafana.nix b/nixos/modules/monitoring/server/grafana.nix
index d8ed7c12..ba1fdf52 100644
--- a/nixos/modules/monitoring/server/grafana.nix
+++ b/nixos/modules/monitoring/server/grafana.nix
@@ -72,7 +72,7 @@ in {
};
grafanaEnvironmentFile = lib.mkOption
{ type = lib.types.path;
- default = /run/keys/grafanaEnvironment;
+ default = /run/keys/grafana-environment;
description = "Where to find the Grafana Systemd EnvironmentFile.";
};
};
--
GitLab