Make domtool-tail actually work

diff --git a/Makefile b/Makefile
index 41e920c..5a47071 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -192,7 +192,6 @@ install: install_sos
        cp scripts/domtool-addacl /usr/local/bin/
        cp scripts/domtool-rmuser /usr/local/bin/
        cp scripts/domtool-admin-sudo /usr/local/bin/
        cp scripts/domtool-addacl /usr/local/bin/
        cp scripts/domtool-rmuser /usr/local/bin/
        cp scripts/domtool-admin-sudo /usr/local/bin/

-       cp scripts/domtool-admin-sudo-noisy /usr/local/bin/

        cp scripts/domtool-server-logged /usr/local/bin/
        cp scripts/domtool-slave-logged /usr/local/bin/
        cp scripts/domtool-server /etc/init.d/
        cp scripts/domtool-server-logged /usr/local/bin/
        cp scripts/domtool-slave-logged /usr/local/bin/
        cp scripts/domtool-server /etc/init.d/

diff --git a/scripts/domtool-admin-sudo-noisy b/scripts/domtool-admin-sudo-noisy
deleted file mode 100755 (executable)
index 6faf512..0000000
--- a/scripts/domtool-admin-sudo-noisy
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/pagsh.openafs
-
-kinit -k -t /etc/keytabs/domtool domtool
-aklog
-domtool-admin $*

diff --git a/src/tail/tail.sml b/src/tail/tail.sml
index 057853c..12576ee 100644 (file)
--- a/src/tail/tail.sml
+++ b/src/tail/tail.sml
@@ -37,12 +37,19 @@ fun main args =
        val args = rev args
     in
        case args of
        val args = rev args
     in
        case args of

-           [vhost] =>
+           [vhost, kind] =>

            let
            let

+               val () = case kind of
+                            "access" => ()
+                          | "error" => ()
+                          | "rewrite" => ()
+                          | _ => (print "Unsupported logfile kind.  Use 'access', 'error', or 'rewrite'.\n";
+                                  OS.Process.exit OS.Process.failure)
+

                val uid = Posix.ProcEnv.getuid ()
                val uname = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 
                val uid = Posix.ProcEnv.getuid ()
                val uname = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 

-               val proc = Unix.execute ("/usr/local/bin/domtool-admin-sudo-noisy", ["perms", uname])
+               val proc = Unix.execute ("/usr/local/bin/domtool-admin", ["perms", uname])

                val inf = Unix.textInstreamOf proc
 
                fun allowed () =
                val inf = Unix.textInstreamOf proc
 
                fun allowed () =


@@ -73,7 +80,10 @@ fun main args =
                                ^ "/apache/log/"
                                ^ hostname ()
                                ^ "/"
                                ^ "/apache/log/"
                                ^ hostname ()
                                ^ "/"

-                               ^ vhost]
+                               ^ vhost
+                               ^ "/"
+                               ^ kind
+                               ^ ".log"]

 
                val tailArgs =
                    if f then
 
                val tailArgs =
                    if f then