Fix firewall input rules, add ProxiedServer directive

[hcoop/domtool2.git] / configDefault / domtool.cfg

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index a838db8..986ab12 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -19,13 +19,14 @@ val defaultRetry = 1800
 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"), ("hopper", "69.90.123.74"), ("fritz", "69.90.123.75"), ("outpost", "74.115.254.28"), ("navajos", "69.90.123.70")]
 val defaultNode = "deleuze"
 
 val masterNode = "deleuze"
-val slaveNodes = ["mire"]
+val slaveNodes = ["mire", "outpost"]
+(* THESE ARE THE DNS MASTER/SLAVE, NOT DOMTOOL NODES *)
 
-val dnsNodes_all = ["deleuze", "mire"]
+val dnsNodes_all = ["deleuze", "mire", "outpost"]
 val dnsNodes_admin = []
 
 val mailNodes_all = ["deleuze"]
@@ -45,8 +46,6 @@ val queueSize = 5
 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"
@@ -60,4 +59,6 @@ fun domtoolDir user =
       | _ => OS.Path.joinDirFile {dir = Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam user),
                                  file = ".domtool"}
 
-val worldReadable = ["/usr/share/moin"]
+val worldReadable = ["/usr/share/moin", "/usr/share/apache/icons"]
+
+val publish_reusers = "/usr/bin/sudo " ^ domtool_publish ^ " users"