HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check user exists before opening incoming ports
[hcoop/domtool2.git]
/
configDefault
/
apache.cfg
diff --git
a/configDefault/apache.cfg
b/configDefault/apache.cfg
index
f2b9918
..
87d50fd
100644
(file)
--- a/
configDefault/apache.cfg
+++ b/
configDefault/apache.cfg
@@
-14,14
+14,19
@@
val fixperms1 = "/usr/bin/sudo /usr/local/sbin/domtool-publish apache1.3-fixperm
val confDir = "/var/domtool/vhosts"
val confDir = "/var/domtool/vhosts"
-val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_all = [("mire", {version = APACHE_2, auth = MOD_WAKLOG}),
+ ("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
-val webNodes_default = ["
mire
"]
+val webNodes_default = ["
navajos
"]
val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
"http://hcoop.net/pipermail"]
val proxyTargets = ["http://hcoop.net/cgi-bin/mailman",
"http://hcoop.net/pipermail"]
+val proxyHosts = ["localhost", (* deprecated! *)
+ "mire",
+ "bog"]
+
val public_html = "public_html"
fun logDirOf version1 user =
val public_html = "public_html"
fun logDirOf version1 user =
@@
-39,10
+44,26
@@
fun logDirOf version1 user =
user,
"/apache/log"]
user,
"/apache/log"]
+fun realLogDirOf user =
+ if size user < 2 then
+ "/bad_username"
+ else
+ String.concat ["/afs/hcoop.net/user/",
+ String.substring (user, 0, 1),
+ "/",
+ String.substring (user, 0, 2),
+ "/",
+ user,
+ "/.logs/apache"]
+
fun backupLogDirOf version1 =
if version1 then
"/afs/hcoop.net/common/etc/domtool/backup/apache/"
else
"/afs/hcoop.net/common/etc/domtool/backup/apache2/"
fun backupLogDirOf version1 =
if version1 then
"/afs/hcoop.net/common/etc/domtool/backup/apache/"
else
"/afs/hcoop.net/common/etc/domtool/backup/apache2/"
+val defaultPhpVersion = 5
+
+val waklogUserFile = "/var/domtool/waklog.conf"
+
end
end