From dae80a3779c74846b4493acbe655d4fca29fa52b Mon Sep 17 00:00:00 2001 From: Leon Vatthauer Date: Wed, 8 May 2024 12:20:42 +0200 Subject: [PATCH] rename vaultwarden --- dafoe/configuration.nix | 2 +- dafoe/services/acme.nix | 2 +- dafoe/services/nginx.nix | 8 ++++++-- dafoe/services/resumee-website.nix | 2 +- dafoe/services/vaultwarden.nix | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dafoe/configuration.nix b/dafoe/configuration.nix index cd5e5eb..09539ce 100644 --- a/dafoe/configuration.nix +++ b/dafoe/configuration.nix @@ -30,7 +30,7 @@ users.users.leonv = { isNormalUser = true; initialPassword = "leonv"; - extraGroups = [ "wheel" ]; # Enable 'sudo' for the user. + extraGroups = [ "wheel" "nginx" ]; # Enable 'sudo' for the user. packages = with pkgs; [ ]; }; diff --git a/dafoe/services/acme.nix b/dafoe/services/acme.nix index c8f2d9c..f8fa687 100644 --- a/dafoe/services/acme.nix +++ b/dafoe/services/acme.nix @@ -2,7 +2,7 @@ security.acme.acceptTerms = true; security.acme.certs = { "git.vatthauer.xyz".email = "leonvatthauer@outlook.com"; - "bitwarden.vatthauer.xyz".email = "leonvatthauer@outlook.com"; + "vaultwarden.vatthauer.xyz".email = "leonvatthauer@outlook.com"; "video.vatthauer.xyz".email = "leonvatthauer@outlook.com"; "files.vatthauer.xyz".email = "leonvatthauer@outlook.com"; "www.vatthauer.xyz".email = "leonvatthauer@outlook.com"; diff --git a/dafoe/services/nginx.nix b/dafoe/services/nginx.nix index b4d42cb..79637c3 100644 --- a/dafoe/services/nginx.nix +++ b/dafoe/services/nginx.nix @@ -16,7 +16,7 @@ }; }; - services.nginx.virtualHosts."bitwarden.vatthauer.xyz" = { + services.nginx.virtualHosts."vaultwarden.vatthauer.xyz" = { enableACME = true; forceSSL = true; locations."/" = { @@ -32,6 +32,7 @@ }; }; services.nginx.virtualHosts."www.vatthauer.xyz" = { + serverAliases = [ "vatthauer.xyz" ]; forceSSL = true; enableACME = true; root = pkgs.callPackage ./resumee-website.nix {}; @@ -39,6 +40,9 @@ services.nginx.virtualHosts."files.vatthauer.xyz" = { forceSSL = true; enableACME = true; - root = "/var/www"; + locations."/" = { + root = "/var/www"; + extraConfig = "autoindex on;"; + }; }; } diff --git a/dafoe/services/resumee-website.nix b/dafoe/services/resumee-website.nix index d898fef..671f2ce 100644 --- a/dafoe/services/resumee-website.nix +++ b/dafoe/services/resumee-website.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { buildPhase = "hugo -d $out"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-PQzuhxRrruBbEfUjhPGPeJkJ6vsbMJ+5Ojg4t11oNV8="; + outputHash = "sha256-BReyv7kH/dSd0xcISbCA8AFing7uFkghkbjF24pU0Og="; } diff --git a/dafoe/services/vaultwarden.nix b/dafoe/services/vaultwarden.nix index 1f7d8a2..6fe8a81 100644 --- a/dafoe/services/vaultwarden.nix +++ b/dafoe/services/vaultwarden.nix @@ -2,7 +2,7 @@ services.vaultwarden = { enable = true; config = { - DOMAIN = "https://bitwarden.vatthauer.xyz"; + DOMAIN = "https://vaultwarden.vatthauer.xyz"; SIGNUPS_ALLOWED = false; ROCKET_ADDRESS = "127.0.0.1";