diff options
| author | Jonas Heinrich <onny@project-insanity.org> | 2022-10-18 16:08:10 +0200 |
|---|---|---|
| committer | Yt <happysalada@proton.me> | 2022-10-21 09:12:25 -0400 |
| commit | c54a28030f9f0268c7575d1f6a6daa44da75ef34 (patch) | |
| tree | 18ed8e776f3e44094a885e3f324aefef2cd19ece | |
| parent | b7ac3c6618989afa122ae5946f4693a220c0a6b0 (diff) | |
| download | nixpkgs-c54a28030f9f0268c7575d1f6a6daa44da75ef34.tar nixpkgs-c54a28030f9f0268c7575d1f6a6daa44da75ef34.tar.gz nixpkgs-c54a28030f9f0268c7575d1f6a6daa44da75ef34.tar.bz2 nixpkgs-c54a28030f9f0268c7575d1f6a6daa44da75ef34.tar.lz nixpkgs-c54a28030f9f0268c7575d1f6a6daa44da75ef34.tar.xz nixpkgs-c54a28030f9f0268c7575d1f6a6daa44da75ef34.tar.zst nixpkgs-c54a28030f9f0268c7575d1f6a6daa44da75ef34.zip | |
nixos/httpd: Make option adminAddr optional
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6b43d46fdea..3ccff8aa500 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -168,7 +168,7 @@ let <VirtualHost ${concatMapStringsSep " " (listen: "${listen.ip}:${toString listen.port}") listen}> ServerName ${hostOpts.hostName} ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases} - ServerAdmin ${adminAddr} + ${optionalString (adminAddr != null) "ServerAdmin ${adminAddr}"} <IfModule mod_ssl.c> SSLEngine off </IfModule> @@ -187,7 +187,7 @@ let <VirtualHost ${concatMapStringsSep " " (listen: "${listen.ip}:${toString listen.port}") listenSSL}> ServerName ${hostOpts.hostName} ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases} - ServerAdmin ${adminAddr} + ${optionalString (adminAddr != null) "ServerAdmin ${adminAddr}"} SSLEngine on SSLCertificateFile ${sslServerCert} SSLCertificateKeyFile ${sslServerKey} @@ -455,8 +455,9 @@ in }; adminAddr = mkOption { - type = types.str; + type = types.nullOr types.str; example = "admin@example.org"; + default = null; description = lib.mdDoc "E-mail address of the server administrator."; }; |