websites.concatenative, factorcode: move a few things into config file

diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index 379ba32a576a0948d6a6a725dd24cd932cf8262a..53c62055540ae64549d689b67b5fcef11b9eb33f 100644 (file)
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -59,19 +59,19 @@ TUPLE: concatenative-website < dispatcher ;
         allow-edit-profile
         allow-deactivation ;
 
+SYMBOLS: factor-recaptcha-public-key factor-recaptcha-private-key ;
+
 : <factor-recaptcha> ( responder -- responder' )
     <recaptcha>
         "concatenative.org" >>domain
-        "6LeJWQgAAAAAAFlYV7SuBClE9uSpGtV_ZS-qVON7" >>public-key
-        "6LeJWQgAAAAAALh-XJgSSQ6xKygRgJ8-029Ip2Xv" >>private-key ;
+        factor-recaptcha-public-key get >>public-key
+        factor-recaptcha-private-key get >>private-key ;
 
 : <concatenative-website> ( -- responder )
     concatenative-website new-dispatcher
         URL" /wiki/view/Front Page" <redirect-responder> "" add-responder ;
 
-SYMBOL: key-password
-SYMBOL: key-file
-SYMBOL: dh-file
+SYMBOLS: key-password key-file dh-file ;
 
 : common-configuration ( -- )
     "concatenative.org" 25 <inet> smtp-server set-global
@@ -112,7 +112,6 @@ SYMBOL: dh-file
         <mason-app> <login-config> <factor-boilerplate> test-db <alloy> "builds.factorcode.org" add-responder
         home "docs" append-path <help-webapp> "docs.factorcode.org" add-responder
         home "cgi" append-path <gitweb> "gitweb.factorcode.org" add-responder
-        <factor-website> "new.factorcode.org" add-responder
     main-responder set-global ;
 
 : <factor-secure-config> ( -- config )

diff --git a/extra/websites/factorcode/factorcode.factor b/extra/websites/factorcode/factorcode.factor
index 36450509b3d01f73d34b955db9ae9ba490c3206d..d4abba7988ccacd3c24bad23facf3b1820b3caa0 100644 (file)
--- a/extra/websites/factorcode/factorcode.factor
+++ b/extra/websites/factorcode/factorcode.factor
@@ -4,14 +4,9 @@ USING: accessors http.server http.server.dispatchers
 http.server.static kernel namespaces sequences ;
 IN: websites.factorcode
 
-SYMBOL: users
-
 : <factor-website> ( -- website )
     <dispatcher>
-        "resource:extra/websites/factorcode/" <static> enable-fhtml >>default
-        users get [
-            [ "/home/" "/www/" surround <static> ] keep add-responder
-        ] each ;
+        "resource:extra/websites/factorcode/" <static> enable-fhtml >>default ;
 
 : init-testing ( -- )
     <factor-website> main-responder set-global ;