Initial Apache 1.3 support

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 541b144..4ea0389 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -25,9 +25,9 @@ open Ast
 val _ = Env.type_one "web_node"
        Env.string
        (fn node =>
-           List.exists (fn x => x = node) Config.Apache.webNodes_all
+           List.exists (fn (x, _) => x = node) Config.Apache.webNodes_all
            orelse (Domain.hasPriv "www"
-                   andalso List.exists (fn x => x = node) Config.Apache.webNodes_admin))
+                   andalso List.exists (fn (x, _) => x = node) Config.Apache.webNodes_admin))
 
 val _ = Env.registerFunction ("web_node_to_node",
                              fn [e] => SOME e
@@ -107,7 +107,7 @@ val _ = Defaults.registerDefault ("Group",
 
 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),
@@ -225,6 +225,17 @@ fun findVhostUser fname =
        before TextIO.closeIn inf
     end handle _ => NONE
 
+val webNodes_full = Config.Apache.webNodes_all @ Config.Apache.webNodes_admin
+
+fun isVersion1 node =
+    List.exists (fn x => x = (node, true)) webNodes_full
+
+fun imVersion1 () = isVersion1 (Slave.hostname ())
+
+fun down () = if imVersion1 () then Config.Apache.down1 else Config.Apache.down
+fun undown () = if imVersion1 () then Config.Apache.undown1 else Config.Apache.undown
+fun reload () = if imVersion1 () then Config.Apache.reload1 else Config.Apache.reload
+
 val () = Slave.registerFileHandler (fn fs =>
                                       let
                                           val spl = OS.Path.splitDirFile (#file fs)
@@ -245,9 +256,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                                       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"}
@@ -259,9 +268,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                                                                         file = Slave.hostname ()}
                                                                   val {base, ...} = OS.Path.splitBaseExt (#file spl)
 
-                                                                  val realLogDir = OS.Path.joinDirFile
-                                                                                       {dir = realLogDir,
-                                                                                        file = base}
+                                                                  val realLogDir = OS.Path.concat (realLogDir, base)
                                                               in
                                                                   if String.isSuffix ".vhost_ssl" (#file spl) then
                                                                       realLogDir ^ ".ssl"
@@ -275,7 +282,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                                               (if !logDeleted then
                                                                    ()
                                                                else
-                                                                   (ignore (OS.Process.system Config.Apache.down);
+                                                                   (ignore (OS.Process.system (down ()));
                                                                     logDeleted := true);
                                                                ignore (OS.Process.system (Config.rm
                                                                                           ^ " -rf "
@@ -312,7 +319,7 @@ val () = Slave.registerFileHandler (fn fs =>
                                                                        if !logDeleted then
                                                                            ()
                                                                        else
-                                                                           (ignore (OS.Process.system Config.Apache.down);
+                                                                           (ignore (OS.Process.system (down ()));
                                                                             logDeleted := true);
                                                                        ignore (OS.Process.system (Config.rm
                                                                                                   ^ " -rf "
@@ -333,7 +340,7 @@ val () = Slave.registerFileHandler (fn fs =>
 val () = Slave.registerPostHandler
         (fn () =>
             (if !vhostsChanged then
-                 Slave.shellF ([if !logDeleted then Config.Apache.undown else Config.Apache.reload],
+                 Slave.shellF ([if !logDeleted then undown () else reload ()],
                                fn cl => "Error reloading Apache with " ^ cl)
              else
                  ()))
@@ -408,35 +415,37 @@ val () = Env.containerV_one "vhost"
                                                                  | 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, 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");
-                                          (Config.homeBase ^ "/" ^ user ^ "/apache/log/"
+                                          TextIO.output (file, "\tServerName ");
+                                          TextIO.output (file, fullHost);
+                                          if suexec then
+                                              if isVersion1 node then
+                                                  (TextIO.output (file, "\n\tUser ");
+                                                   TextIO.output (file, user);
+                                                   TextIO.output (file, "\n\tGroup ");
+                                                   TextIO.output (file, group))
+                                              else
+                                                  (TextIO.output (file, "\n\tSuexecUserGroup ");
+                                                   TextIO.output (file, user);
+                                                   TextIO.output (file, " ");
+                                                   TextIO.output (file, group))
+                                          else
+                                              ();
+                                          (Domain.homedirOf user ^ "/apache/log/"
                                            ^ node ^ "/" ^ vhostId, file)
                                       end)
                                   nodes;
-                write "\tServerName ";
-                write fullHost;
-                if suexec then
-                    (write "\n\tSuexecUserGroup ";
-                     write user;
-                     write " ";
-                     write group)
-                else
-                    ();
                 write "\n\tDocumentRoot ";
                 write docroot;
                 write "\n\tServerAdmin ";