movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-19 07:59:24 +03:00
Code Activity

Merge pull request #194759 from hercules-ci/fqdn-or-hostname

Browse source 
nixos: Add `networking.fqdnOrHostName`
This commit is contained in:
Robert Hensing 2022-11-09 13:53:57 +01:00 • committed by GitHub
commit 93a905ec4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/web-apps/discourse.nix
View file

@ -42,11 +42,8 @@ in
hostname = lib.mkOption {
type = lib.types.str;
default = if config.networking.domain != null then
config.networking.fqdn
else
config.networking.hostName;
defaultText = lib.literalExpression "config.networking.fqdn";
default = config.networking.fqdnOrHostName;
defaultText = lib.literalExpression "config.networking.fqdnOrHostName";
example = "discourse.example.com";
description = lib.mdDoc ''
The hostname to serve Discourse on.