remove Group directive from Apache and group acl from domtool-addacl

[hcoop/domtool2.git] / src / plugins / apache.sml

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 48c7f6f..c69b3d3 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -103,7 +103,7 @@ val _ = Defaults.registerDefault ("User",
 
 val _ = Defaults.registerDefault ("Group",
                                  (TBase "your_group", dl),
-                                 (fn () => (EString (Domain.getUser ()), dl)))
+                                 (fn () => (EString "nogroup", dl)))
 
 val _ = Defaults.registerDefault ("DocumentRoot",
                                  (TBase "your_path", dl),
@@ -423,6 +423,12 @@ val () = Env.containerV_one "vhost"
                                           TextIO.output (file, "/access.log combined\n");
                                           TextIO.output (file, "\tServerName ");
                                           TextIO.output (file, fullHost);
+                                          app
+                                              (fn dom => (TextIO.output (file, "\n\tServerAlias ");
+                                                          TextIO.output (file, host);
+                                                          TextIO.output (file, ".");
+                                                          TextIO.output (file, dom)))
+                                              (Domain.currentAliasDomains ());
                                           if suexec then
                                               if isVersion1 node then
                                                   (TextIO.output (file, "\n\tUser ");
@@ -456,7 +462,8 @@ val () = Env.containerV_one "vhost"
                      write cert)
                   | NONE => ();
                 write "\n";
-                !pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost}
+                !pre {user = user, nodes = nodes, id = vhostId, hostname = fullHost};
+                app (fn dom => !aliaser (host ^ "." ^ dom)) (Domain.currentAliasDomains ())
             end,
          fn () => (!post ();
                    write "</VirtualHost>\n";
@@ -634,7 +641,7 @@ val () = Env.action_one "directoryIndex"
              app (fn opt => (write " "; write opt)) opts;
              write "\n"))
 
-val () = Env.action_one "serverAlias"
+val () = Env.action_one "serverAliasHost"
         ("host", Env.string)
         (fn host =>
             (write "\tServerAlias ";
@@ -642,6 +649,31 @@ val () = Env.action_one "serverAlias"
              write "\n";
              !aliaser host))
 
+val () = Env.action_one "serverAlias"
+        ("host", Env.string)
+        (fn host =>
+            (app
+                 (fn dom =>
+                     let
+                         val full = host ^ "." ^ dom
+                     in
+                         write "\tServerAlias ";
+                         write full;
+                         write "\n";
+                         !aliaser full
+                     end)
+                 (Domain.currentDomains ())))
+
+val () = Env.action_none "serverAliasDefault"
+        (fn () =>
+            (app
+                 (fn dom =>
+                         (write "\tServerAlias ";
+                          write dom;
+                          write "\n";
+                          !aliaser dom))
+                 (Domain.currentDomains ())))
+
 val authType = fn (EVar "basic", _) => SOME "basic"
                | (EVar "digest", _) => SOME "digest"
                | _ => NONE