diff --git a/machines/servo/services/pleroma.nix b/machines/servo/services/pleroma.nix index d53fa2875..0d3284dd5 100644 --- a/machines/servo/services/pleroma.nix +++ b/machines/servo/services/pleroma.nix @@ -15,13 +15,13 @@ services.pleroma.configs = [ '' import Config - + config :pleroma, Pleroma.Web.Endpoint, url: [host: "fed.uninsane.org", scheme: "https", port: 443], http: [ip: {127, 0, 0, 1}, port: 4000] # secret_key_base: "{secrets.pleroma.secret_key_base}", # signing_salt: "{secrets.pleroma.signing_salt}" - + config :pleroma, :instance, name: "Perfectly Sane", description: "Single-user Pleroma instance", @@ -47,7 +47,7 @@ enabled: false, redirect_on_failure: true #base_url: "https://cache.pleroma.social" - + config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, username: "pleroma", @@ -67,7 +67,7 @@ # private_key: "{secrets.pleroma.vapid_private_key}" # config :joken, default_signer: "{secrets.pleroma.joken_default_signer}" - + config :pleroma, :database, rum_enabled: false config :pleroma, :instance, static_dir: "/var/lib/pleroma/instance/static" config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" @@ -86,14 +86,14 @@ # Enable Strict-Transport-Security once SSL is working: config :pleroma, :http_security, sts: true - + # docs: https://docs.pleroma.social/backend/configuration/cheatsheet/#logger config :logger, backends: [{ExSyslogger, :ex_syslogger}] - + config :logger, :ex_syslogger, - level: :warn - # level: :debug + level: :debug + # level: :warn # XXX colin: not sure if this actually _does_ anything config :pleroma, :emoji, diff --git a/nixpatches/192472-pleroma-no-strip-debug.patch b/nixpatches/192472-pleroma-no-strip-debug.patch new file mode 100644 index 000000000..43a912390 --- /dev/null +++ b/nixpatches/192472-pleroma-no-strip-debug.patch @@ -0,0 +1,12 @@ +diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix +index 3bea304ebc9d3..e4204f28f1d5c 100644 +--- a/pkgs/servers/pleroma/default.nix ++++ b/pkgs/servers/pleroma/default.nix +@@ -16,6 +16,7 @@ beamPackages.mixRelease rec { + rev = "v${version}"; + sha256 = "sha256-x8j/2Eot/EEHsedgZntB5MPxlYMNDlFyZtmiMdhcS7U="; + }; ++ stripDebug = false; + + mixNixDeps = import ./mix.nix { + inherit beamPackages lib; diff --git a/nixpatches/list.nix b/nixpatches/list.nix index da7705475..8280de8ab 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -26,4 +26,15 @@ fetchpatch: [ url = "https://github.com/NixOS/nixpkgs/pull/191467.diff"; sha256 = "sha256-Np0J06RER/0GGUhL/PDuVjpYYIPzB9A3EPWwTWpS/D4="; }) + + # (fetchpatch { + # url = "https://github.com/NixOS/nixpkgs/pull/192472.diff"; + # sha256 = "sha256-J4Vp2yErNZkKqZbpLY4mMo9n0Qtai1mAh6kZ8DOV4v4="; + # }) + # (fetchpatch { + # url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/192472.diff"; + # sha256 = "sha256-J5Vp2yErNZkKqZbpLY4mMo9n0Qtai1mAh6kZ8DOV4v4="; + # }) + + ./192472-pleroma-no-strip-debug.patch ]