diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor index 379ba32a57..53c6205554 100644 --- 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 ; + : ( responder -- responder' ) "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 ; : ( -- responder ) concatenative-website new-dispatcher URL" /wiki/view/Front Page" "" add-responder ; -SYMBOL: key-password -SYMBOL: key-file -SYMBOL: dh-file +SYMBOLS: key-password key-file dh-file ; : common-configuration ( -- ) "concatenative.org" 25 smtp-server set-global @@ -112,7 +112,6 @@ SYMBOL: dh-file test-db "builds.factorcode.org" add-responder home "docs" append-path "docs.factorcode.org" add-responder home "cgi" append-path "gitweb.factorcode.org" add-responder - "new.factorcode.org" add-responder main-responder set-global ; : ( -- config ) diff --git a/extra/websites/factorcode/factorcode.factor b/extra/websites/factorcode/factorcode.factor index 36450509b3..d4abba7988 100644 --- 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 - : ( -- website ) - "resource:extra/websites/factorcode/" enable-fhtml >>default - users get [ - [ "/home/" "/www/" surround ] keep add-responder - ] each ; + "resource:extra/websites/factorcode/" enable-fhtml >>default ; : init-testing ( -- ) main-responder set-global ;