From 33fd7ada93f6082b62423cc17baf3ea79950cf46 Mon Sep 17 00:00:00 2001 From: harry123 Date: Sat, 10 May 2025 10:27:04 +0200 Subject: [PATCH] even more fixes --- hosts/sisyphe/configuration.nix | 7 +++++ hosts/sisyphe/features/prometheus.nix | 37 ++++++++++++++++----------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index b97f292..0a474f8 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -47,6 +47,13 @@ in initialHashedPassword = "$y$j9T$H0D6NpMw1EU.oDhbMWrwL.$wDGGBKKGQdzeDRTzq0gWhoLdyUpQ2w6PMmGl.nuQ11/"; }; + users.users.deploy = { + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP9Yp7TbDhYJ27Sh+LcPXT569bMVwbFrkE4zksfU84l+ harry123@goober" + ]; + }; + users.users.root.initialHashedPassword = "$y$j9T$99/NEnBGoewbrl5eHvTw7/$87rjPrvqs0Ys72338SxZJDibi8p7Fe8Can37rJyhcQ."; environment.systemPackages = with pkgs; [ diff --git a/hosts/sisyphe/features/prometheus.nix b/hosts/sisyphe/features/prometheus.nix index 747f936..4ab07c2 100644 --- a/hosts/sisyphe/features/prometheus.nix +++ b/hosts/sisyphe/features/prometheus.nix @@ -17,17 +17,21 @@ systemd = { enable = true; }; - sabnzbd = { - enable = true; + # TODO: enable prometheus services based on whether they are enabled or not + /* + sabnzbd = { + enable = true; - servers = [ - { - "sisyphe" = { - baseUrl = "http://nzb.sisyphe.normandy.rougebordeaux.xyz"; - apiKeyFile = "/run/secrets/sabnbzd_apikey"; - } - ]; - }; + servers = [ + { + "sisyphe" = { + baseUrl = "http://nzb.sisyphe.normandy.rougebordeaux.xyz"; + apiKeyFile = "/run/secrets/sabnbzd_apikey"; + }; + } + ]; + }; + */ redis = { enable = true; }; @@ -41,11 +45,14 @@ php-fpm = { enable = true; }; - nextcloud = { - enable = true; - url = "https://cloud.rougebordeaux.xyz"; - tokenFile = "/run/secrets/nextcloudTokenFile"; - }; + /* + TODO: need to fix secrets before + nextcloud = { + enable = true; + url = "https://cloud.rougebordeaux.xyz"; + tokenFile = "/run/secrets/nextcloudTokenFile"; + }; + */ }; scrapeConfigs = [