gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/httpd: Make option adminAddr optional

Browse Source
This commit is contained in:
Jonas Heinrich
2022-10-18 16:08:10 +02:00
committed by Yt
parent b7ac3c6618
commit c54a28030f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@@ -168,7 +168,7 @@ let
<VirtualHost ${concatMapStringsSep " " (listen: "${listen.ip}:${toString listen.port}") listen}> <VirtualHost ${concatMapStringsSep " " (listen: "${listen.ip}:${toString listen.port}") listen}>
ServerName ${hostOpts.hostName} ServerName ${hostOpts.hostName}
${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases} ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases}
ServerAdmin ${adminAddr} ${optionalString (adminAddr != null) "ServerAdmin ${adminAddr}"}
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
SSLEngine off SSLEngine off
</IfModule> </IfModule>
@@ -187,7 +187,7 @@ let
<VirtualHost ${concatMapStringsSep " " (listen: "${listen.ip}:${toString listen.port}") listenSSL}> <VirtualHost ${concatMapStringsSep " " (listen: "${listen.ip}:${toString listen.port}") listenSSL}>
ServerName ${hostOpts.hostName} ServerName ${hostOpts.hostName}
${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases} ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases}
ServerAdmin ${adminAddr} ${optionalString (adminAddr != null) "ServerAdmin ${adminAddr}"}
SSLEngine on SSLEngine on
SSLCertificateFile ${sslServerCert} SSLCertificateFile ${sslServerCert}
SSLCertificateKeyFile ${sslServerKey} SSLCertificateKeyFile ${sslServerKey}
@@ -455,8 +455,9 @@ in
}; };
adminAddr = mkOption { adminAddr = mkOption {
type = types.str; type = types.nullOr types.str;
example = "admin@example.org"; example = "admin@example.org";
default = null;
description = lib.mdDoc "E-mail address of the server administrator."; description = lib.mdDoc "E-mail address of the server administrator.";
}; };