HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove silly special-case servercert stuff
[hcoop/domtool2.git]
/
configDefault
/
domtool.cfg
diff --git
a/configDefault/domtool.cfg
b/configDefault/domtool.cfg
index
6e6b25e
..
5fc7009
100644
(file)
--- a/
configDefault/domtool.cfg
+++ b/
configDefault/domtool.cfg
@@
-1,6
+1,7
@@
val libRoot = "/afs/hcoop.net/common/etc/domtool/lib"
val resultRoot = "/afs/hcoop.net/common/etc/domtool/nodes"
val tmpDir = "/tmp/domtool"
val libRoot = "/afs/hcoop.net/common/etc/domtool/lib"
val resultRoot = "/afs/hcoop.net/common/etc/domtool/nodes"
val tmpDir = "/tmp/domtool"
+val oldResultRoot = "/afs/hcoop.net/common/etc/domtool/nodes.old"
val cat = "/bin/cat"
val cp = "/bin/cp"
val cat = "/bin/cat"
val cp = "/bin/cp"
@@
-13,22
+14,22
@@
val domtool_publish = "/usr/local/sbin/domtool-publish"
val defaultNs = "ns1.hcoop.net"
val defaultNs = "ns1.hcoop.net"
-val defaultRefresh =
1728
00
-val defaultRetry =
9
00
+val defaultRefresh =
864
00
+val defaultRetry =
18
00
val defaultExpiry = 1209600
val defaultMinimum = 3600
val defaultExpiry = 1209600
val defaultMinimum = 3600
-val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68")]
+val nodeIps = [("deleuze", "69.90.123.67"), ("mire", "69.90.123.68")
, ("outpost", "89.16.166.179")
]
val defaultNode = "deleuze"
val masterNode = "deleuze"
val defaultNode = "deleuze"
val masterNode = "deleuze"
-val slaveNodes = ["mire"]
+val slaveNodes = ["mire"
, "outpost"
]
-val dnsNodes_all = ["deleuze", "mire"]
+val dnsNodes_all = ["deleuze", "mire"
, "outpost"
]
val dnsNodes_admin = []
val mailNodes_all = ["deleuze"]
val dnsNodes_admin = []
val mailNodes_all = ["deleuze"]
-val mailNodes_admin = ["mire"]
+val mailNodes_admin = ["mire"
, "outpost"
]
val aclFile = "/afs/hcoop.net/common/etc/domtool/acl"
val aclFile = "/afs/hcoop.net/common/etc/domtool/acl"
@@
-44,8
+45,6
@@
val queueSize = 5
val bufSize = 1024
val trustStore = "/afs/hcoop.net/common/etc/domtool/TrustStore.pem"
val bufSize = 1024
val trustStore = "/afs/hcoop.net/common/etc/domtool/TrustStore.pem"
-val serverCert = "/afs/hcoop.net/common/etc/domtool/servercert.pem"
-val serverKey = "/etc/domtool/serverkey.pem"
val certDir = "/afs/hcoop.net/common/etc/domtool/certs"
val keyDir = "/afs/hcoop.net/common/etc/domtool/keys"
val certDir = "/afs/hcoop.net/common/etc/domtool/certs"
val keyDir = "/afs/hcoop.net/common/etc/domtool/keys"
@@
-58,3
+57,5
@@
fun domtoolDir user =
"domtool" => "/afs/hcoop.net/common/etc/domtool/.domtool"
| _ => OS.Path.joinDirFile {dir = Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam user),
file = ".domtool"}
"domtool" => "/afs/hcoop.net/common/etc/domtool/.domtool"
| _ => OS.Path.joinDirFile {dir = Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam user),
file = ".domtool"}
+
+val worldReadable = ["/usr/share/moin"]