Unverified Commit c65021a7 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #304547 from cafkafk/fix-300343 

akkoma: make options work for 23.11 state
parents 2b3411f8 8a1dbedd

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

+11 −0
Original line number Diff line number Diff line
@@ -772,6 +772,11 @@ in { 
                    default = if lib.versionOlder config.system.stateVersion "24.05"

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

                              else null;

                    defaultText = literalExpression ''

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

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

                      else null;

                    '';

                    description = ''

                      Base path which uploads will be stored at.

                      Whilst this can just be set to a subdirectory of the main domain, it is now recommended to use a different subdomain.
@@ -804,6 +809,7 @@ in { 
                enabled = mkOption {

                    type = types.bool;

                    default = false;

                    defaultText = literalExpression "false";

                    description = ''

                      Whether to enable proxying of remote media through the instance's proxy.

                    '';
@@ -813,6 +819,11 @@ in { 
                    default = if lib.versionOlder config.system.stateVersion "24.05"

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

                              else null;

                    defaultText = literalExpression ''

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

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

                      else null;

                    '';

                    description = ''

                      Base path for the media proxy.

                      Whilst this can just be set to a subdirectory of the main domain, it is now recommended to use a different subdomain.