From 24f4f270c1380aeada31c6ac50fc6dba0e9994b9 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 10 Jan 2025 19:51:00 +0100 Subject: [PATCH 1/3] Server/grafana: set root url --- roles/server/grafana.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/server/grafana.nix b/roles/server/grafana.nix index a09ff0e..99eb5d9 100644 --- a/roles/server/grafana.nix +++ b/roles/server/grafana.nix @@ -39,6 +39,7 @@ in { }; server = { protocol = "socket"; + root_url = "https://${domain}"; }; }; }; From 36ac10c6dd963654ce983a6fddc88e473d57ccd5 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 10 Jan 2025 20:02:29 +0100 Subject: [PATCH 2/3] Server/grafana: change security settings --- roles/server/grafana.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/server/grafana.nix b/roles/server/grafana.nix index 99eb5d9..957c41b 100644 --- a/roles/server/grafana.nix +++ b/roles/server/grafana.nix @@ -36,6 +36,9 @@ in { security = { admin_user = "$__file{${config.age.secrets.grafanaAdminName.path}}"; admin_password = "$__file{${config.age.secrets.grafanaAdminPassword.path}}"; + cookie_secure = true; + strict_transport_security = true; + content_security_policy = true; }; server = { protocol = "socket"; From 904bb98f3661c15b60aa7e3d3223d97e92bc8f37 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 13 Jan 2025 12:44:37 +0100 Subject: [PATCH 3/3] Flake: fully remove nix-minecraft references --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index 1ad8d71..d18b3ac 100644 --- a/flake.nix +++ b/flake.nix @@ -219,8 +219,6 @@ Everest = { stable = true; modules = [ - nix-minecraft.nixosModules.minecraft-servers - {nixpkgs.overlays = [nix-minecraft.overlay];} ./roles/server ]; };