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

nixos/akkoma: Fix media proxy URLs after upgrade
This commit is contained in:
Thomas Gerbet
2024-04-26 00:39:11 +02:00
committed by GitHub
+2 -2
View File
@@ -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 = ''