Skip to content

Commit

Permalink
docs: fix platform-specific default texts
Browse files Browse the repository at this point in the history
  • Loading branch information
sandydoo committed Sep 17, 2024
1 parent 5021830 commit e94eae0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/modules/services/caddy.nix
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ in

dataDir = mkOption {
default = "${config.env.DEVENV_STATE}/caddy";
defaultText = literalExpression ''"${config.env.DEVENV_STATE}/caddy"'';
defaultText = literalExpression "\"\${config.env.DEVENV_STATE}/caddy\"";
type = types.path;
description = ''
The data directory, for storing certificates. Before 17.09, this
Expand Down
5 changes: 4 additions & 1 deletion src/modules/services/trafficserver/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ in
package = lib.mkOption {
type = types.package;
default = pkgs.trafficserver;
defaultText = lib.literalExpression "pkgs.trafficserver";
description = "Apache Traffic Server package";
};

runroot = lib.mkOption {
readOnly = true;
default = runroot;
description = "File layout used by Traffic Server";
};

Expand Down Expand Up @@ -298,6 +298,7 @@ in
storage = lib.mkOption {
type = types.lines;
default = "${runroot.cachedir} 256M";
defaultText = lib.literalExpression "\"\${config.services.traffic-server.runroot.cachedir} 256M\"";
example = "/dev/disk/by-id/XXXXX volume=1";
description = ''
List all the storage that make up the Traffic Server cache.
Expand Down Expand Up @@ -358,5 +359,7 @@ in

services.trafficserver.records.proxy.config.body_factory.template_sets_dir =
lib.mkDefault "${cfg.package}/etc/trafficserver/body_factory";

services.trafficserver.runroot = runroot;
};
}

0 comments on commit e94eae0

Please sign in to comment.