From ff6f7bf20ded9d8df7f18867ac0d9790176b36c2 Mon Sep 17 00:00:00 2001 From: Alexander Szczepanski Date: Wed, 25 Dec 2024 13:44:28 +0100 Subject: [PATCH] vps-arm-2024-12-25-13-44-28 --- configs/services/grafana.nix | 40 ++++++++++++++++++++++++++++ machine/vps-arm/configuration.nix | 44 +++++++------------------------ 2 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 configs/services/grafana.nix diff --git a/configs/services/grafana.nix b/configs/services/grafana.nix new file mode 100644 index 0000000..37cc282 --- /dev/null +++ b/configs/services/grafana.nix @@ -0,0 +1,40 @@ +{ + config, + lib, + pkgs, + ... +}: { + services = { + nginx = { + virtualHosts = { + "grafana.szczepan.ski" = { + forceSSL = true; + enableACME = true; + locations = { + "/" = { + proxyPass = "http://${toString config.services.grafana.settings.server.http_addr}:${toString config.services.grafana.settings.server.http_port}"; + proxyWebsockets = true; + recommendedProxySettings = true; + }; + }; + }; + }; + }; + + grafana = { + enable = true; + settings = { + server = { + # Listening Address + http_addr = "127.0.0.1"; + # and Port + http_port = 3005; + # Grafana needs to know on which domain and URL it's running + domain = "grafana.szczepan.ski"; + # root_url = "https://grafana.szczepan.ski/"; # Not needed if it is `https://your.domain/` + # serve_from_sub_path = true; + }; + }; + }; + }; +} diff --git a/machine/vps-arm/configuration.nix b/machine/vps-arm/configuration.nix index 78fc22f..fe7c91e 100644 --- a/machine/vps-arm/configuration.nix +++ b/machine/vps-arm/configuration.nix @@ -11,7 +11,7 @@ ../../configs/common-linux.nix ../../configs/docker.nix ../../configs/user.nix - # ../../configs/borg.nix + ../../configs/borg.nix ../../configs/services/adguardhome.nix ../../configs/services/atuin.nix @@ -19,6 +19,7 @@ ../../configs/services/frigate.nix ../../configs/services/gitea.nix ../../configs/services/goaccess.nix + ../../configs/services/grafana.nix ../../configs/services/headscale.nix ../../configs/services/immich.nix ../../configs/services/nextcloud.nix @@ -255,39 +256,14 @@ }; }; - # borgbackup.jobs.home = rec { - # compression = "auto,zstd"; - # encryption = { - # mode = "repokey-blake2"; - # passCommand = "cat ${config.sops.secrets.borg-key.path}"; - # }; - # extraCreateArgs = "--stats --verbose --checkpoint-interval=600 --exclude-caches"; - # extraPruneArgs = [ - # "--save-space" - # "--stats" - # ]; - # extraCompactArgs = [ - # "--cleanup-commits" - # ]; - # environment = { - # BORG_RSH = "ssh -i /home/alex/.ssh/id_borg_rsa"; - # BORG_BASE_DIR = "/persist/borg"; - # }; - # readWritePaths = ["/persist/borg"]; - # paths = ["/home/alex" "/persist"]; - # repo = "ssh://u278697-sub3@u278697.your-storagebox.de:23/./borg-arm"; - # startAt = "daily"; - # prune.keep = { - # daily = 7; - # weekly = 4; - # monthly = 6; - # }; - # exclude = [ - # "/home/alex/mounted" - # "/home/alex/.cache" - # "/persist/borg" - # ]; - # }; + borgbackup.jobs.all = rec { + repo = "ssh://u278697-sub3@u278697.your-storagebox.de:23/./borg-arm"; + exclude = [ + "/home/alex/mounted" + "/home/alex/.cache" + "/persist/borg" + ]; + }; journald = {extraConfig = "SystemMaxUse=10G";}; };