mysql: revoke permissions when dropping database

[hcoop/domtool2.git] / lib / easy_domain.dtl

diff --git a/lib/easy_domain.dtl b/lib/easy_domain.dtl
index fbee762..ee8e82d 100644 (file)
--- a/lib/easy_domain.dtl
+++ b/lib/easy_domain.dtl
@@ -32,7 +32,7 @@ val webAtIp =
   \ host : (host) ->
   \\ config : Vhost -> begin
     dns (dnsA (literal host) (your_ip_to_ip ip));
-    dns (dnsAAAA (literal host) (your_ipv6_to_ipv6 ip));
+    dns (dnsAAAA (literal host) (your_ipv6_to_ipv6 ipv6));
 
     vhost host where
       WebPlaces = [web_place web_node ip ipv6]
@@ -53,6 +53,10 @@ val webSsl = \ host -> \ certFile -> \\ config : Vhost -> begin
       SSL = no_ssl;
     with
       rewriteRule "^(.*)$" "https://%{HTTP_HOST}$1" [redirect];
+
+      config; (* config is included in case of directives like
+                 serverAliasDefault. https rewrite should override all
+                 others since it matches first. *)
     end;
   else
     webAt n host where