From d7dd9179cec036620a0ad02c5038402250c0fc5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Feb 2008 14:41:20 +0000
Subject: [PATCH] * Allow aliases for each virtual host.

svn path=/nixos/trunk/; revision=10754
---
 upstart-jobs/apache-httpd/default.nix            | 2 ++
 upstart-jobs/apache-httpd/per-server-options.nix | 8 ++++++++
 2 files changed, 10 insertions(+)

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 = "