Unverified Commit f8deac79 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #305155 from Mynacol/akkoma-fix-proxy 

nixos/akkoma: Fix media proxy URLs after upgrade
parents c3ec6b8f 774cd77f

nixos/modules/services/web-apps/akkoma.nix

+2 −2
Original line number Diff line number Diff line
@@ -817,11 +817,11 @@ in { 
                base_url = mkOption {

                    type = types.nullOr types.nonEmptyStr;

                    default = if lib.versionOlder config.system.stateVersion "24.05"

                              then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}/media/"

                              then "${httpConf.scheme}://${httpConf.host}:${builtins.toString httpConf.port}"

                              else null;

                    defaultText = literalExpression ''

                      if lib.versionOlder config.system.stateVersion "24.05"

                      then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}/media/"

                      then "$\{httpConf.scheme}://$\{httpConf.host}:$\{builtins.toString httpConf.port}"

                      else null;

                    '';

                    description = ''