From 5e20edc46e063dc76e20b7f7e0250b3001af1c6b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 26 Oct 2020 00:47:39 +0100 Subject: [PATCH] breve: fix wrong cert/key location --- configuration.nix | 13 ++++--- secrets/default.nix | 86 ++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/configuration.nix b/configuration.nix index 964bbfc..dfa10d3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -236,13 +236,13 @@ }; ### URL shortner - services.breve = { + services.breve = with config.secrets; { enable = true; hostname = "localhost"; baseUrl = "https://brve.bit/"; port = 2000; - certificate = "/var/lib/breve/breve.crt"; - key = "/var/lib/breve/breve.key"; + certificate = certs.breve.crt; + key = certs.breve.key; }; ### Git server @@ -338,11 +338,10 @@ }; # Breve URL shortner - virtualHosts."brve.bit" = { + virtualHosts."brve.bit" = with config.secrets; { forceSSL = true; - - sslCertificate = "/var/lib/breve/breve.crt"; - sslCertificateKey = "/var/lib/breve/breve.key"; + sslCertificate = certs.breve.crt; + sslCertificateKey = certs.breve.key; locations."/" = { proxyPass = "https://localhost:2000"; diff --git a/secrets/default.nix b/secrets/default.nix index 5a9ef1e..68cd9c9 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,43 +1,43 @@ -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 -p6krltwsQGFLXH+N +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