diff --git a/src/modules/services/caddy.nix b/src/modules/services/caddy.nix index 8bdb5434a..790aecf89 100644 --- a/src/modules/services/caddy.nix +++ b/src/modules/services/caddy.nix @@ -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 diff --git a/src/modules/services/trafficserver/default.nix b/src/modules/services/trafficserver/default.nix index e700da07c..dd27e284b 100644 --- a/src/modules/services/trafficserver/default.nix +++ b/src/modules/services/trafficserver/default.nix @@ -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"; }; @@ -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. @@ -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; }; }