HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hcoop: remove fritz and bog from domtool control
[hcoop/domtool2.git]
/
configDefault
/
apache.cfg
diff --git
a/configDefault/apache.cfg
b/configDefault/apache.cfg
index
ccb222d
..
4cf1168
100644
(file)
--- a/
configDefault/apache.cfg
+++ b/
configDefault/apache.cfg
@@
-2,27
+2,25
@@
structure Apache :> APACHE_CONFIG = struct
open ConfigTypes
open ConfigTypes
-val reload =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache"
-val down =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache-down"
-val undown =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache-undown"
-val fixperms =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache-fixperms"
+val reload =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache"
+val down =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache-down"
+val undown =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache-undown"
+val fixperms =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache-fixperms"
-val reload1 =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache1.3"
-val down1 =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache1.3-down"
-val undown1 =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache1.3-undown"
-val fixperms1 =
"/usr/bin/sudo /usr/local
/sbin/domtool-publish apache1.3-fixperms"
+val reload1 =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache1.3"
+val down1 =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache1.3-down"
+val undown1 =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache1.3-undown"
+val fixperms1 =
ConfigCore.sudo ^ " " ^ ConfigCore.installPrefix ^ "
/sbin/domtool-publish apache1.3-fixperms"
-val confDir =
"/var/domtool
/vhosts"
+val confDir =
ConfigCore.localRoot ^ "
/vhosts"
-val webNodes_all = [("navajos", {version = APACHE_2, auth = MOD_WAKLOG})]
-val webNodes_admin = [("deleuze", {version = APACHE_2, auth = MOD_WAKLOG})]
-
-val webNodes_default = ["navajos"]
+val webNodes_all = [("shelob", {version = APACHE_2, auth = MOD_WAKLOG})]
+val webNodes_admin = [("minsky", {version = APACHE_2, auth = MOD_WAKLOG})]
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 = ["
bog
"]
+val proxyHosts = ["
marsh
"]
val public_html = "public_html"
val public_html = "public_html"
@@
-41,6
+39,7
@@
fun logDirOf version1 user =
user,
"/apache/log"]
user,
"/apache/log"]
+(* FIXME: hcoop.net reference *)
fun realLogDirOf user =
if size user < 2 then
"/bad_username"
fun realLogDirOf user =
if size user < 2 then
"/bad_username"
@@
-55,12
+54,28
@@
fun realLogDirOf user =
fun backupLogDirOf version1 =
if version1 then
fun backupLogDirOf version1 =
if version1 then
- "/afs/hcoop.net/common/etc/domtool/backup/apache/"
+ ConfigCore.sharedRoot ^ "/backup/apache/"
+ else
+ ConfigCore.sharedRoot ^ "/backup/apache2/"
+
+fun fastCgiWrapperOf user =
+ if size user < 2 then
+ "/bad_username"
else
else
- "/afs/hcoop.net/common/etc/domtool/backup/apache2/"
+ String.concat [ConfigCore.sharedRoot,
+ "/httpd/fastcgi/",
+ String.substring (user, 0, 1),
+ "/",
+ String.substring (user, 0, 2),
+ "/",
+ user,
+ "/",
+ user,
+ "-wrapper-wrapper"]
-val defaultPhpVersion = 5
+(* FIXME: hcoop reference *)
+val phpFastCgiWrapper = "/afs/hcoop.net/common/bin/php5-fcgi-wrapper"
-val waklogUserFile =
"/var/domtool
/waklog.conf"
+val waklogUserFile =
ConfigCore.localRoot ^ "
/waklog.conf"
end
end