From 948c4a427f66addcc2556ed74076f5fa6f0931be Mon Sep 17 00:00:00 2001 From: iFargle Date: Wed, 5 Jul 2023 10:05:02 +0900 Subject: [PATCH] test --- ...8BBC6C9A27324654C2D8C464F6C4EB46C4543A.asc | 76 +++++++++++++++++++ keys/users/albert.gpg | 73 ------------------ services/promtail.nix | 19 ++--- 3 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 keys/users/D98BBC6C9A27324654C2D8C464F6C4EB46C4543A.asc delete mode 100644 keys/users/albert.gpg diff --git a/keys/users/D98BBC6C9A27324654C2D8C464F6C4EB46C4543A.asc b/keys/users/D98BBC6C9A27324654C2D8C464F6C4EB46C4543A.asc new file mode 100644 index 00000000..2a04efa8 --- /dev/null +++ b/keys/users/D98BBC6C9A27324654C2D8C464F6C4EB46C4543A.asc @@ -0,0 +1,76 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: D98B BC6C 9A27 3246 54C2 D8C4 64F6 C4EB 46C4 543A +Comment: Albert J. Copeland + +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 +=NST7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/keys/users/albert.gpg b/keys/users/albert.gpg deleted file mode 100644 index e9dad43e..00000000 --- a/keys/users/albert.gpg +++ /dev/null @@ -1,73 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -08J1IgWoIIjZCf5SFlE= -=CwCE ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/services/promtail.nix b/services/promtail.nix index 83a7722f..eebe42fc 100644 --- a/services/promtail.nix +++ b/services/promtail.nix @@ -1,13 +1,10 @@ { config, pkgs, sops-nix, ... }: { # Promtail Logging - - # Import the file: - sops.defaultSopsFile = ./secrets/secrets.yaml; - - # Define the secrets - config.sops.secrets.promtail.user = {}; - config.sops.secrets.promtail.pass = {}; - config.sops.secrets.promtail.url = {}; + + sops.secrets.promtail-password = { + owner = "promtail"; + sopsFile = ../secrets/secrets.yaml; + }; # Install the package environment.systemPackages = with pkgs; [ @@ -27,10 +24,10 @@ filename = "/tmp/positions.yaml"; }; clients = [{ - url = config.sops.secrets.promtail.url.path; + url = "https://"; basic_auth = { - username = config.sops.secrets.promtail.user.path; - password = config.sops.secrets.promtail.pass.path; + username = "loki-sa"; + password_file = config.sops.secrets.promtail.pass.path; }; }]; scrape_configs = [{