From 4e1e14566943ec4574a498f54dd359bbe123826f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 18 Jun 2008 03:40:05 -0500
Subject: [PATCH] Tweaking config some more

---
 .../concatenative/concatenative.factor        | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index a4f826d7f6..6d65f10783 100644
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -63,19 +63,33 @@ TUPLE: factor-website < dispatcher ;
         { factor-website "page" } >>template
     test-db <alloy> ;
 
-: init-factor-website ( -- )
-    "factorcode.org" 25 <inet> smtp-server set-global
+SYMBOL: key-password
+SYMBOL: key-file
+SYMBOL: dh-file
+
+: common-configuration ( -- )
+    "concatenative.org" 25 <inet> smtp-server set-global
     "noreply@concatenative.org" lost-password-from set-global
     "website@concatenative.org" insomniac-sender set-global
     "slava@factorcode.org" insomniac-recipients set-global
-    init-factor-db
-    <factor-website> main-responder set-global ;
+    <factor-website> main-responder set-global
+    init-factor-db ;
+
+: init-testing ( -- )
+    "resource:extra/openssl/test/dh1024.pem" dh-file set-global
+    "resource:extra/openssl/test/server.pem" key-file set-global
+    "password" key-password set-global
+    common-configuration ;
+
+: init-production ( -- )
+    "/home/slava/cert/host.pem" key-file set-global
+    common-configuration ;
 
 : <factor-secure-config> ( -- config )
     <secure-config>
-        "resource:extra/openssl/test/server.pem" >>key-file
-        "resource:extra/openssl/test/dh1024.pem" >>dh-file
-        "password" >>password ;
+        key-file get >>key-file
+        dh-file get >>dh-file
+        key-password get >>password ;
 
 : <factor-website-server> ( -- threaded-server )
     <http-server>
@@ -83,7 +97,7 @@ TUPLE: factor-website < dispatcher ;
         8080 >>insecure
         8431 >>secure ;
 
-: start-factor-website ( -- )
+: start-website ( -- )
     test-db start-expiring
     test-db start-update-task
     http-insomniac