debug

7 files changed, 10 insertions, 18 deletions

diff --git a/config/default.nix b/config/default.nix
index ffbbef3..9cb4668 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -6,10 +6,9 @@
     (modulesPath + "/profiles/minimal.nix")
     ./boot.nix
     ./environment.nix
-    ./ihatemoney.nix
     ./hardware-configuration.nix
     ./networking.nix
-    ./searx
+    ./services
     ./users.nix
   ];
 
diff --git a/config/services/web/default.nix b/config/services/web/default.nix
index e0bdae8..23f7394 100644
--- a/config/services/web/default.nix
+++ b/config/services/web/default.nix
@@ -1,10 +1,7 @@
 { ... }:
 
 {
-  import = [
-    ./quentin
-    ./searx
-  ];
+  imports = [ ./quentin ./searx ];
 
   security.acme = {
     acceptTerms = true;
@@ -17,7 +14,7 @@
     virtualHosts."_" = {
       default = true;
       extraConfig = ''
-        return 444
+        return 444;
       '';
     };
   };
diff --git a/config/services/web/quentin/default.nix b/config/services/web/quentin/default.nix
index 6ca712c..78796bb 100644
--- a/config/services/web/quentin/default.nix
+++ b/config/services/web/quentin/default.nix
@@ -1,9 +1,7 @@
 { pkgs, lib, config, ... }:
 
 {
-  import = [
-    ./ihatemoney
-  ];
+  imports = [ ./ihatemoney ];
 
   services.nginx.virtualHosts."quentin.aristote.fr" = {
     locations."/".root = "${pkgs.personal.academic-webpage}";
diff --git a/config/services/web/quentin/ihatemoney/default.nix b/config/services/web/quentin/ihatemoney/default.nix
index 8a29aec..19f7af2 100644
--- a/config/services/web/quentin/ihatemoney/default.nix
+++ b/config/services/web/quentin/ihatemoney/default.nix
@@ -4,7 +4,7 @@ let cfg = config.services.ihatemoney;
 in {
   services.nginx.virtualHosts."quentin.aristote.fr".locations =
     lib.mkIf cfg.enable {
-      "/money/".proxyPass = "http://127.0.0.1${cfg.uwsgiConfig}";
+      "/money/".proxyPass = "http://127.0.0.1${cfg.uwsgiConfig.http}";
     };
 
   services.ihatemoney = {
diff --git a/config/services/web/searx/default.nix b/config/services/web/searx/default.nix
index 7c5e593..e42f884 100644
--- a/config/services/web/searx/default.nix
+++ b/config/services/web/searx/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = {
@@ -24,7 +24,7 @@ in {
             # proxy_set_header X-Script-Name   /;
           '';
         };
-        "/static".alias = "${pkgs.searx}/sjare/static";
+        "/static/".alias = "${pkgs.searx}/sjare/static";
       };
       forceSSL = true;
       enableACME = true;
diff --git a/config/services/web/searx/morty/default.nix b/config/services/web/searx/morty/default.nix
index 1a2b0e7..8eeede8 100644
--- a/config/services/web/searx/morty/default.nix
+++ b/config/services/web/searx/morty/default.nix
@@ -16,7 +16,5 @@ in {
       };
     };
 
-  services.morty = {
-    enable = false;
-  };
+  services.morty = { enable = false; };
 }
diff --git a/config/services/web/searx/searx/default.nix b/config/services/web/searx/searx/default.nix
index 575b978..c8edd2e 100644
--- a/config/services/web/searx/searx/default.nix
+++ b/config/services/web/searx/searx/default.nix
@@ -12,7 +12,7 @@ in {
     runInUwsgi = true;
     uwsgiConfig = {
       cache2 = "name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1";
-      http = "$http://${cfg.filtron.target.address}:${toString cfg.filtron.target.port}";
+      http = "http://${cfg.filtron.target.address}:${toString cfg.filtron.target.port}";
     };
 
     environmentFile = /etc/searx/secrets;
@@ -36,7 +36,7 @@ in {
       ui = { theme_args = { oscar_style = "pointhi"; }; };
       result_proxy = lib.mkIf cfg.morty.enable {
         url = "http://searx.aristote.fr/morty";
-        key = ''!!binary | "${keys.morty}"'';
+        key = ''!!binary | "${cfg.morty.key}"'';
       };
       enabled_plugins = [
         "Open Access DOI rewrite"