summaryrefslogtreecommitdiffstats
path: root/nixos/modules
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-12-10 21:54:01 +0100
committerGitHub <noreply@github.com>2020-12-10 21:54:01 +0100
commit07aff199ad882caece7dc4497164af0152859bec (patch)
treee21c85ef45ca6ab350ea66e1f9ed8c10c7461de3 /nixos/modules
parent4eb94d0ca13c532cf62a25e412017eb4408ff275 (diff)
parent55ef9612a24d53594f97c71ff38b9e46b0980c9c (diff)
Merge pull request #106080 from Ma27/nginx-config-doc
nixos/nginx: improve documentation for `config`
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 {