diff --git a/clients/quadraticserver/lasuite-docs.nix b/clients/quadraticserver/docs/default.nix similarity index 86% rename from clients/quadraticserver/lasuite-docs.nix rename to clients/quadraticserver/docs/default.nix index 33842ec..0aae7f3 100644 --- a/clients/quadraticserver/lasuite-docs.nix +++ b/clients/quadraticserver/docs/default.nix @@ -53,9 +53,18 @@ in enableNginx = false; redis.createLocally = true; postgresql.createLocally = true; - frontendPackage = pkgs.lasuite-docs-frontend.overrideAttrs { - NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; - }; + 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; bind = "unix:${socket}"; inherit s3Url domain; @@ -74,7 +83,6 @@ 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/docs/enable-languages.patch b/clients/quadraticserver/docs/enable-languages.patch new file mode 100644 index 0000000..f607294 --- /dev/null +++ b/clients/quadraticserver/docs/enable-languages.patch @@ -0,0 +1,13 @@ +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/network.nix b/clients/quadraticserver/network.nix index 6364345..7707281 100644 --- a/clients/quadraticserver/network.nix +++ b/clients/quadraticserver/network.nix @@ -8,7 +8,6 @@ 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 a8e0c58..91b12cf 100644 --- a/clients/quadraticserver/searxng.nix +++ b/clients/quadraticserver/searxng.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, ... }: { services = let @@ -12,7 +12,8 @@ let enginesByCategory = { general = { - brave.disabled = false; + duckduckgo = { }; + startpage = { }; }; "social media" = { @@ -64,7 +65,7 @@ { general = { instance_name = "Federated Nexus Search"; - contact_url = "mailto:info@federated.nexus"; + contact_url = "mailto:henry@henryhiles.com"; }; search = { @@ -90,11 +91,6 @@ "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;