Switch to using system database to find user home directories

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 541b144..f476c97 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -107,7 +107,7 @@ val _ = Defaults.registerDefault ("Group",
 
 val _ = Defaults.registerDefault ("DocumentRoot",
                                  (TBase "your_path", dl),
 
 val _ = Defaults.registerDefault ("DocumentRoot",
                                  (TBase "your_path", dl),

-                                 (fn () => (EString (Config.homeBase ^ "/" ^ Domain.getUser () ^ "/" ^ Config.Apache.public_html), dl)))
+                                 (fn () => (EString (Domain.homedir () ^ "/" ^ Config.Apache.public_html), dl)))

 
 val _ = Defaults.registerDefault ("ServerAdmin",
                                  (TBase "email", dl),
 
 val _ = Defaults.registerDefault ("ServerAdmin",
                                  (TBase "email", dl),


@@ -245,9 +245,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                                       let
                                                           fun realLogDir user =
                                                               let
                                                       let
                                                           fun realLogDir user =
                                                               let

-                                                                  val realLogDir = OS.Path.joinDirFile
-                                                                                       {dir = Config.homeBase,
-                                                                                        file = valOf user}
+                                                                  val realLogDir = Domain.homedirOf (valOf user)

                                                                   val realLogDir = OS.Path.joinDirFile
                                                                                        {dir = realLogDir,
                                                                                         file = "apache"}
                                                                   val realLogDir = OS.Path.joinDirFile
                                                                                        {dir = realLogDir,
                                                                                         file = "apache"}


@@ -408,23 +406,19 @@ val () = Env.containerV_one "vhost"
                                                                  | NONE => "80");
                                           TextIO.output (file, ">\n");
                                           TextIO.output (file, "\tErrorLog ");
                                                                  | NONE => "80");
                                           TextIO.output (file, ">\n");
                                           TextIO.output (file, "\tErrorLog ");

-                                          TextIO.output (file, Config.homeBase);
-                                          TextIO.output (file, "/");
-                                          TextIO.output (file, user);
+                                          TextIO.output (file, Domain.homedirOf user);

                                           TextIO.output (file, "/apache/log/");
                                           TextIO.output (file, node);
                                           TextIO.output (file, "/");
                                           TextIO.output (file, vhostId);
                                           TextIO.output (file, "/error.log\n\tCustomLog ");
                                           TextIO.output (file, "/apache/log/");
                                           TextIO.output (file, node);
                                           TextIO.output (file, "/");
                                           TextIO.output (file, vhostId);
                                           TextIO.output (file, "/error.log\n\tCustomLog ");

-                                          TextIO.output (file, Config.homeBase);
-                                          TextIO.output (file, "/");
-                                          TextIO.output (file, user);
+                                          TextIO.output (file, Domain.homedirOf user);

                                           TextIO.output (file, "/apache/log/");
                                           TextIO.output (file, node);
                                           TextIO.output (file, "/");
                                           TextIO.output (file, vhostId);
                                           TextIO.output (file, "/access.log combined\n");
                                           TextIO.output (file, "/apache/log/");
                                           TextIO.output (file, node);
                                           TextIO.output (file, "/");
                                           TextIO.output (file, vhostId);
                                           TextIO.output (file, "/access.log combined\n");

-                                          (Config.homeBase ^ "/" ^ user ^ "/apache/log/"
+                                          (Domain.homedirOf user ^ "/apache/log/"

                                            ^ node ^ "/" ^ vhostId, file)
                                       end)
                                   nodes;
                                            ^ node ^ "/" ^ vhostId, file)
                                       end)
                                   nodes;