diff --git a/clients/quadraticserver/docs/enable-languages.patch b/clients/quadraticserver/docs/enable-languages.patch deleted file mode 100644 index f607294..0000000 --- a/clients/quadraticserver/docs/enable-languages.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/backend/impress/settings.py b/src/backend/impress/settings.py -index 9059dd29..010cc524 100755 ---- a/impress/settings.py -+++ b/impress/settings.py -@@ -248,6 +248,9 @@ class Base(Configuration): - ("de-de", "Deutsch"), - ("nl-nl", "Nederlands"), - ("es-es", "Español"), -+ ("br-fr", "Brezhoneg"), -+ ("uk-ua", "Українська"), -+ ("ru-ru", "Русский"), - ) - ) \ No newline at end of file diff --git a/clients/quadraticserver/docs/default.nix b/clients/quadraticserver/lasuite-docs.nix similarity index 86% rename from clients/quadraticserver/docs/default.nix rename to clients/quadraticserver/lasuite-docs.nix index 0aae7f3..33842ec 100644 --- a/clients/quadraticserver/docs/default.nix +++ b/clients/quadraticserver/lasuite-docs.nix @@ -53,18 +53,9 @@ in enableNginx = false; redis.createLocally = true; postgresql.createLocally = true; - backendPackage = - inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs.overrideAttrs - (old: { - patches = (old.patches or [ ]) ++ [ ./enable-languages.patch ]; - }); - frontendPackage = - inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-frontend.overrideAttrs - { - NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; - }; - collaborationServer.package = - inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-collaboration-server; + frontendPackage = pkgs.lasuite-docs-frontend.overrideAttrs { + NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; + }; bind = "unix:${socket}"; inherit s3Url domain; @@ -83,6 +74,7 @@ in MEDIA_BASE_URL = "https://${domain}"; DJANGO_ALLOWED_HOSTS = domain; + DJANGO_LANGUAGES = "en-us,English;fr-fr,Français;nl-nl,Nederlands;es-es,Español;uk-ua,Українська;ru-ru,Русский"; }; environmentFile = config.age.secrets."lasuiteSecrets.age".path; diff --git a/clients/quadraticserver/network.nix b/clients/quadraticserver/network.nix index 7707281..6364345 100644 --- a/clients/quadraticserver/network.nix +++ b/clients/quadraticserver/network.nix @@ -8,6 +8,7 @@ address = [ "91.99.155.129/32" + "2a01:4f8:c012:d202::1/64" ] # Assign 64 IPv6 addresses ++ builtins.genList (i: "2a01:4f8:c012:d202::${builtins.toString (i + 1)}/64") 64; diff --git a/clients/quadraticserver/searxng.nix b/clients/quadraticserver/searxng.nix index 91b12cf..a8e0c58 100644 --- a/clients/quadraticserver/searxng.nix +++ b/clients/quadraticserver/searxng.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ lib, config, ... }: { services = let @@ -12,8 +12,7 @@ let enginesByCategory = { general = { - duckduckgo = { }; - startpage = { }; + brave.disabled = false; }; "social media" = { @@ -65,7 +64,7 @@ { general = { instance_name = "Federated Nexus Search"; - contact_url = "mailto:henry@henryhiles.com"; + contact_url = "mailto:info@federated.nexus"; }; search = { @@ -91,6 +90,11 @@ "searx.plugins.tracker_url_remover.SXNGPlugin".active = true; }; + outgoing = { + source_ips = config.systemd.network.networks."30-wan".address; + retries = 32; + }; + categories_as_tabs = builtins.listToAttrs ( map (category: { name = category;