From eac20c1f2e1ebe0a9d6b28cb5105ff046d5f14c2 Mon Sep 17 00:00:00 2001 From: emily Date: Thu, 3 Oct 2024 14:50:51 +0200 Subject: [PATCH 1/2] vaultwarden: Fix secret owner --- config/services/vaultwarden.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/services/vaultwarden.nix b/config/services/vaultwarden.nix index f4d1b11..bd8655b 100644 --- a/config/services/vaultwarden.nix +++ b/config/services/vaultwarden.nix @@ -5,14 +5,14 @@ }; sops.secrets."services/vaultwarden/basicAuth" = { sopsFile = ../../secrets/services/vaultwarden.yaml; - owner = "vaultwarden"; + owner = "nginx"; }; services.vaultwarden = { enable = true; environmentFile = config.sops.secrets."services/vaultwarden/environmentFile".path; backupDir = "/var/backup/bitwarden_rs"; config = { - DOMAIN = "https://staging.vault.kyouma.net"; + DOMAIN = "https://vault.kyouma.net"; DATABASE_MAX_CONNS = 15; WEB_VAULT_ENABLED = true; WEBSOCKET_ADDRESS = "::1"; @@ -33,10 +33,10 @@ SMTP_SECURITY = "starttls"; SMTP_PORT = 587; ROCKET_ADDRESS = "::1"; - ROCKET_PORT = "8222"; + ROCKET_PORT = 8222; }; }; - kyouma.nginx.virtualHosts."staging.vault.kyouma.net" = { + kyouma.nginx.virtualHosts."vault.kyouma.net" = { locations."/" = { proxyPass = "http://[::1]:8222"; proxyWebsockets = true; @@ -46,5 +46,5 @@ basicAuthFile = config.sops.secrets."services/vaultwarden/basicAuth".path; }; }; - security.acme.certs."staging.vault.kyouma.net" = {}; + security.acme.certs."vault.kyouma.net" = {}; } From f04564930aeb199b21cca45db4b0b9eb6d4667a8 Mon Sep 17 00:00:00 2001 From: Update Bot Date: Fri, 4 Oct 2024 04:20:34 +0200 Subject: [PATCH 2/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/568727a884ae7cd9f266bd19aea655def8cafd78' (2024-10-02) → 'github:nix-community/disko/574400001b3ffe555c7a21e0ff846230759be2ed' (2024-10-03) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6190625..dced301 100644 --- a/flake.lock +++ b/flake.lock @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1727872461, - "narHash": "sha256-4Pw3fVhN6xey5+2gUBm9nQJAjBqivffr+a5ZsXYjzJ8=", + "lastModified": 1727977578, + "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", "owner": "nix-community", "repo": "disko", - "rev": "568727a884ae7cd9f266bd19aea655def8cafd78", + "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", "type": "github" }, "original": {