HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New mod_waklog version
[hcoop/domtool2.git]
/
configDefault
/
apache.cfg
diff --git
a/configDefault/apache.cfg
b/configDefault/apache.cfg
index
4ef970b
..
053d17a
100644
(file)
--- a/
configDefault/apache.cfg
+++ b/
configDefault/apache.cfg
@@
-12,7
+12,7
@@
val undown1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-undown"
val confDir = "/var/domtool/vhosts"
val confDir = "/var/domtool/vhosts"
-val webNodes_all = [("mire", {version = APACHE_
1_3
, auth = MOD_WAKLOG})]
+val webNodes_all = [("mire", {version = APACHE_
2
, auth = MOD_WAKLOG})]
val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
val webNodes_default = ["mire"]
val webNodes_admin = [("deleuze", {version = APACHE_2, auth = NO_AUTH})]
val webNodes_default = ["mire"]
@@
-22,11
+22,14
@@
val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
val public_html = "public_html"
val public_html = "public_html"
-fun logDirOf user =
+fun logDirOf
version1
user =
if size user < 2 then
"/bad_username"
else
if size user < 2 then
"/bad_username"
else
- String.concat ["/var/log/apache/user/",
+ String.concat [if version1 then
+ "/var/log/apache/user/"
+ else
+ "/var/log/apache2/user/",
String.substring (user, 0, 1),
"/",
String.substring (user, 0, 2),
String.substring (user, 0, 1),
"/",
String.substring (user, 0, 2),