diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix index 77f49f4152a..9afe278398c 100644 --- a/upstart-jobs/apache-httpd/default.nix +++ b/upstart-jobs/apache-httpd/default.nix @@ -165,6 +165,8 @@ let in '' ServerName ${serverInfo.canonicalName} + ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases} + ${if isMainServer || cfg.adminAddr != "" then '' ServerAdmin ${cfg.adminAddr} '' else ""} diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/upstart-jobs/apache-httpd/per-server-options.nix index f98412b0a90..dbc422ec0cd 100644 --- a/upstart-jobs/apache-httpd/per-server-options.nix +++ b/upstart-jobs/apache-httpd/per-server-options.nix @@ -14,6 +14,14 @@ "; }; + serverAliases = mkOption { + default = []; + example = ["www.example.org" "www.example.org:8080" "example.org"]; + description = " + Additional names of virtual hosts served by this virtual host configuration. + "; + }; + httpPort = mkOption { default = 80; description = "