From d74e0032bb025cb1530eff1259925f50413d17a1 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Sun, 21 Jan 2024 00:15:59 +0000 Subject: [PATCH] Fix failing vps1 checks --- flake.nix | 2 +- hosts/common.nix | 1 + modules/services/coturn/default.nix | 2 +- modules/services/matrix-synapse/default.nix | 1 - modules/services/nginx/default.nix | 2 -- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index eeae09c..27f70c0 100644 --- a/flake.nix +++ b/flake.nix @@ -112,7 +112,7 @@ }; }; - # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; + checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; }; } diff --git a/hosts/common.nix b/hosts/common.nix index 82f48b3..6c711a8 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -36,6 +36,7 @@ ''; users.defaultUserShell = pkgs.zsh; + programs.zsh.enable = true; nix = { package = pkgs.nixFlakes; diff --git a/modules/services/coturn/default.nix b/modules/services/coturn/default.nix index 8ddbe4c..3db488e 100644 --- a/modules/services/coturn/default.nix +++ b/modules/services/coturn/default.nix @@ -39,7 +39,7 @@ in { enable = true; lt-cred-mech = true; use-auth-secret = true; - static-auth-secret-file = config.age.secrets."passwords/services/coturn/shared-secret"; + static-auth-secret-file = config.age.secrets."passwords/services/coturn/shared-secret".path; realm = "turn.vimium.com"; relay-ips = [ "198.244.190.160" diff --git a/modules/services/matrix-synapse/default.nix b/modules/services/matrix-synapse/default.nix index 9b39a9c..a6f73da 100644 --- a/modules/services/matrix-synapse/default.nix +++ b/modules/services/matrix-synapse/default.nix @@ -109,7 +109,6 @@ in { }; services.matrix-synapse = { - package = pkgs.unstable.matrix-synapse; enable = true; settings = { database.name = "sqlite3"; diff --git a/modules/services/nginx/default.nix b/modules/services/nginx/default.nix index fafad00..64a8ee1 100644 --- a/modules/services/nginx/default.nix +++ b/modules/services/nginx/default.nix @@ -134,8 +134,6 @@ in { extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders + '' add_header Content-Security-Policy "default-src 'self' https://vimium.com https://www.vimium.com; style-src 'unsafe-inline'; object-src 'none'; upgrade-insecure-requests" always; ''; - locations."= /.well-known/matrix/server".extraConfig = (mkWellKnown matrixServerConfig); - locations."= /.well-known/matrix/client".extraConfig = (mkWellKnown matrixClientConfig); locations."/" = { root = "/var/www/vimium.com"; };