colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #304547 from cafkafk/fix-300343 

akkoma: make options work for 23.11 state
This commit is contained in:
Martin Weinelt 2024-04-16 15:13:43 +02:00 committed by GitHub
parent 2b3411f879 8a1dbedde5
commit c65021a7b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/web-apps/akkoma.nix
View File

@ -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.