From: Adam Chlipala <adamc@hcoop.net>
Date: Thu, 6 Dec 2007 02:19:19 +0000 (+0000)
Subject: Fix some Apache types
X-Git-Tag: release_2010-11-19~104
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/36578c0ce98b42d5329ff1ac4e6a15d126b3cce4?hp=e322749aaf1c399d172e803e2a8d3d67616d092b

Fix some Apache types
---

diff --git a/lib/apache.dtl b/lib/apache.dtl
index db9dc37..9ad396a 100644
--- a/lib/apache.dtl
+++ b/lib/apache.dtl
@@ -49,16 +49,16 @@ context Location;
 extern type location;
 {{A valid URI prefix}}
 
-extern val location : location -> Vhost & Location => [Vhost & !Location];
+extern val location : location -> ^Vhost & Location => [Vhost & !Location];
 extern val directory : your_path -> ^Vhost & Location => [Vhost & !Location];
 {{Set some configuration specific to a URI prefix or filesystem directory,
   respectively.}}
 
-extern val serverAliasHost : your_domain_host -> [Vhost];
+extern val serverAliasHost : your_domain_host -> [Vhost & !Location];
 {{Give an alternate hostname for this vhost.}}
-extern val serverAlias : host -> [Vhost];
+extern val serverAlias : host -> [Vhost & !Location];
 {{Like serverAliasHost, but adds an alias for the given hostname at every domain
   being configured.}}
-extern val serverAliasDefault : [Vhost];
+extern val serverAliasDefault : [Vhost & !Location];
 {{Like serverAliasDefault, but adds aliases for the domains being configured
   instead of any of their hosts/"subdomains".}}