summaryrefslogtreecommitdiffstats
path: root/nixos/modules
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-12-06 17:26:13 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2020-12-06 17:26:13 +0100
commit55ef9612a24d53594f97c71ff38b9e46b0980c9c (patch)
treec7316c5c2f24c3c8018c31139717b2aaff1a221a /nixos/modules
parent3d629ef7231b9e477d7fafd2705675cfd5f37b8b (diff)
nixos/nginx: improve documentation for `config`
Unfortunately, I had a use-case where `services.nginx.config` was necessary quite recently. While working on that config I had to look up the module's code to understand which options can be used and which don't. To slightly improve the situation, I changed the documentation like this: * Added `types.str` as type since `config` is not mergeable on purpose. It must be a string as it's rendered verbatim into `nginx.conf` and if the type is `unspecified`, it can be confused with RFC42-like options. * Mention which config options that don't generate config in `nginx.conf` are NOT mutually exclusive.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix23
1 files changed, 17 insertions, 6 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index e9630d379f36..62671e9d7484 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -390,13 +390,24 @@ in
};
config = mkOption {
+ type = types.str;
default = "";
- description = "
- Verbatim nginx.conf configuration.
- This is mutually exclusive with the structured configuration
- via virtualHosts and the recommendedXyzSettings configuration
- options. See appendConfig for appending to the generated http block.
- ";
+ description = ''
+ Verbatim <filename>nginx.conf</filename> configuration.
+ This is mutually exclusive to any other config option for
+ <filename>nginx.conf</filename> except for
+ <itemizedlist>
+ <listitem><para><xref linkend="opt-services.nginx.appendConfig" />
+ </para></listitem>
+ <listitem><para><xref linkend="opt-services.nginx.httpConfig" />
+ </para></listitem>
+ <listitem><para><xref linkend="opt-services.nginx.logError" />
+ </para></listitem>
+ </itemizedlist>
+
+ If additional verbatim config in addition to other options is needed,
+ <xref linkend="opt-services.nginx.appendConfig" /> should be used instead.
+ '';
};
appendConfig = mkOption {