From 71d3c48279e440adbd953dbc8dd85669a9642121 Mon Sep 17 00:00:00 2001 From: emily Date: Thu, 14 Nov 2024 18:16:49 +0100 Subject: [PATCH] admin-fe: disable unused features --- config/services/akkoma/default.nix | 8 +++++++- pkgs/akkoma-admin-fe/default.nix | 7 +++++++ pkgs/akkoma-admin-fe/disable-options.patch | 12 ++++++++++++ pkgs/overlay.nix | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/akkoma-admin-fe/default.nix create mode 100644 pkgs/akkoma-admin-fe/disable-options.patch diff --git a/config/services/akkoma/default.nix b/config/services/akkoma/default.nix index 9901e50..d4e6a1b 100644 --- a/config/services/akkoma/default.nix +++ b/config/services/akkoma/default.nix @@ -49,7 +49,7 @@ ref = "5f0339ce00"; }; admin = { - package = pkgs.akkoma-frontends.admin-fe; + package = pkgs.akkoma-admin-fe; name = "admin-fe"; ref = "stable"; }; @@ -247,6 +247,12 @@ }; locations."^/media(/.*)$".return = "308 https://media.florp.social$1"; locations."^/proxy(/.*)$".return = "308 https://cache.florp.social$1"; + locations."= /api/v1/pleroma/admin/config" = { + return = ''200 {"error":"You must enable configurable_from_database in your config file."}''; + extraConfig = '' + types { } default_type "application/json; charset=utf-8"; + ''; + }; }; "media.florp.social" = { diff --git a/pkgs/akkoma-admin-fe/default.nix b/pkgs/akkoma-admin-fe/default.nix new file mode 100644 index 0000000..e4fa685 --- /dev/null +++ b/pkgs/akkoma-admin-fe/default.nix @@ -0,0 +1,7 @@ +{ + akkoma-frontends +}: + +akkoma-frontends.admin-fe.overrideAttrs { + patches = [ ./disable-options.patch ]; +} diff --git a/pkgs/akkoma-admin-fe/disable-options.patch b/pkgs/akkoma-admin-fe/disable-options.patch new file mode 100644 index 0000000..6441cad --- /dev/null +++ b/pkgs/akkoma-admin-fe/disable-options.patch @@ -0,0 +1,12 @@ +diff --git a/config/prod.env.js b/config/prod.env.js +index 7acb93a2..ea500e99 100644 +--- a/config/prod.env.js ++++ b/config/prod.env.js +@@ -2,6 +2,6 @@ module.exports = { + NODE_ENV: '"production"', + ENV_CONFIG: '"prod"', + BASE_API: '"https://api-prod"', +- DISABLED_FEATURES: '[""]', ++ DISABLED_FEATURES: '["settings","media-proxy-cache","relays"]', + ASSETS_PUBLIC_PATH: '/pleroma/admin/' + } diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 8934f1c..5a40d24 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -6,6 +6,7 @@ final: prev: { librespeed-rust = final.callPackage ./librespeed-rust/default.nix {}; librespeed-go = final.callPackage ./librespeed-go/default.nix {}; akkoma-fe-domi = final.callPackage ./akkoma-fe-domi/default.nix {}; + akkoma-admin-fe = final.callPackage ./akkoma-admin-fe/default.nix {}; nginxQuic = prev.nginxQuic.override { withSlice = true; # Use zlib because zlib-ng uses larger buffers then nginx preallocates.