Remove silly special-case servercert stuff

diff --git a/configDefault/domtool.cfg b/configDefault/domtool.cfg
index 83accc7..5fc7009 100644 (file)
--- a/configDefault/domtool.cfg
+++ b/configDefault/domtool.cfg
@@ -45,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"

diff --git a/configDefault/domtool.cfs b/configDefault/domtool.cfs
index cb638c7..a8b04ee 100644 (file)
--- a/configDefault/domtool.cfs
+++ b/configDefault/domtool.cfs
@@ -50,8 +50,6 @@ val queueSize : int
 val bufSize : int
 
 val trustStore : string
 val bufSize : int
 
 val trustStore : string

-val serverCert : string
-val serverKey : string

 
 val certDir : string
 val keyDir : string
 
 val certDir : string
 val keyDir : string

diff --git a/src/main.sml b/src/main.sml
index 02bb485..62af91b 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -1128,10 +1128,12 @@ fun describeQuery q =
 
 fun service () =
     let
 
 fun service () =
     let

+       val host = Slave.hostname ()
+

        val () = Acl.read Config.aclFile
        val () = Acl.read Config.aclFile

-       
-       val context = context (Config.serverCert,
-                              Config.serverKey,
+
+       val context = context (Config.certDir ^ "/" ^ host ^ ".pem",
+                              Config.keyDir ^ "/" ^ host ^ "/key.pem",

                               Config.trustStore)
        val _ = Domain.set_context context
 
                               Config.trustStore)
        val _ = Domain.set_context context