From: adamch <adamch>
Date: Sat, 17 Nov 2007 19:26:18 +0000 (+0000)
Subject: Make Apache play nice with regen rmdom'ing
X-Git-Url: http://git.hcoop.net/hcoop/zz_old/domtool2-proto.git/commitdiff_plain/a5083ebf82c12769e351f10c2e48ee2351b5a6ff

Make Apache play nice with regen rmdom'ing
---

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 765d696..132f479 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -256,7 +256,9 @@ val () = Slave.registerFileHandler (fn fs =>
 									    file = #file spl}
 
 						   val user = findVhostUser (#file fs)
-						   val oldUser = findVhostUser realVhostFile
+						   val oldUser = case #action fs of
+								     Slave.Delete false => user
+								   | _ => findVhostUser realVhostFile
 					       in
 						   if (oldUser = NONE andalso #action fs <> Slave.Add)
 						      orelse (user = NONE andalso not (Slave.isDelete (#action fs))) then