Adding Apache SetEnv

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 4c60d7a..e4e96ea 100644 (file)
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -443,9 +443,9 @@ val () = Env.containerV_one "vhost"
                                           else
                                               ();
                                           if isWaklog node then
-                                              (TextIO.output (file, "\n\tWaklogProtected on\n\tWaklogPrincipal ");
+                                              (TextIO.output (file, "\n\tWaklogEnabled on\n\tWaklogLocationPrincipal ");
                                                TextIO.output (file, user);
-                                               TextIO.output (file, "/cgi@HCOOP.NET /etc/keytabs/cgi/");
+                                               TextIO.output (file, "/daemon@HCOOP.NET /etc/keytabs/user.daemon/");
                                                TextIO.output (file, user))
                                           else
                                               ();
@@ -570,6 +570,14 @@ val () = Env.action_three "rewriteCond"
                                 write "]");
              write "\n"))
 
+val () = Env.action_one "rewriteBase"
+        ("prefix", Env.string)
+        (fn prefix =>
+            (checkRewrite ();
+             write "\tRewriteBase\t";
+             write prefix;
+             write "\n"))
+
 val () = Env.action_one "rewriteLogLevel"
         ("level", Env.int)
         (fn level =>
@@ -856,6 +864,14 @@ val () = Env.action_one "readmeName"
                      write name;
                      write "\n"))
 
+val () = Env.action_two "setEnv"
+        ("key", Env.string, "value", Env.string)
+        (fn (key, value) => (write "\tSetEnv \"";
+                             write key;
+                             write "\" \"";
+                             write value;
+                             write "\"\n"))
+
 val () = Domain.registerResetLocal (fn () =>
                                       ignore (OS.Process.system (Config.rm ^ " -rf /var/domtool/vhosts/*")))