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 7e3deb5..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),
 
 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),
 
 val _ = Defaults.registerDefault ("DocumentRoot",
                                  (TBase "your_path", dl),


@@ -462,7 +462,8 @@ val () = Env.containerV_one "vhost"
                      write cert)
                   | NONE => ();
                 write "\n";
                      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";
             end,
          fn () => (!post ();
                    write "</VirtualHost>\n";