nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #304556: akkoma: make options work for 23.11 state

Browse Source 
...into release-23.11
This commit is contained in:
Vladimír Čunát
2024-04-16 16:07:15 +02:00
parent c520a09d10 dce7d5c321
commit e5aed4b635
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -777,6 +777,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 = mdDoc ''
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.
@@ -809,6 +814,7 @@ in {
enabled = mkOption {
type = types.bool;
default = false;
defaultText = literalExpression "false";
description = mdDoc ''
Whether to enable proxying of remote media through the instance's proxy.
'';
@@ -818,6 +824,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 = mdDoc ''
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.