websites.concatenative: change DB path

diff --git a/extra/webapps/mason/backend/backend.factor b/extra/webapps/mason/backend/backend.factor
index 217e6b8a1a0935761e7cd0e18b5fdf0dc3111582..bb77dd81437a049792b3a2af3f7eb3be5968b0ff 100644 (file)
--- a/extra/webapps/mason/backend/backend.factor
+++ b/extra/webapps/mason/backend/backend.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar db db.sqlite db.tuples db.types kernel
-math math.order sequences combinators.short-circuit ;
+math math.order sequences combinators.short-circuit
+io.pathnames ;
 IN: webapps.mason.backend
 
 CONSTANT: +idle+ "idle"
@@ -72,7 +73,7 @@ counter "COUNTER" {
 : os/cpu ( builder -- string )
     [ os>> ] [ cpu>> ] bi "/" glue ;
 
-: mason-db ( -- db ) "resource:mason.db" <sqlite-db> ;
+: mason-db ( -- db ) home "mason.db" append-path <sqlite-db> ;
 
 : with-mason-db ( quot -- )
     mason-db [ with-transaction ] with-db ; inline

diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index 53c62055540ae64549d689b67b5fcef11b9eb33f..d14f52e8dff308c7a0948d347a6b12e1631d179e 100644 (file)
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -30,12 +30,12 @@ webapps.mason.backend
 websites.factorcode ;
 IN: websites.concatenative
 
-: test-db ( -- db ) "resource:test.db" <sqlite-db> ;
+: website-db ( -- db ) home "website.db" append-path <sqlite-db> ;
 
 : init-factor-db ( -- )
     mason-db [ init-mason-db ] with-db
 
-    test-db [
+    website-db [
         init-furnace-tables
 
         {
@@ -92,7 +92,7 @@ SYMBOLS: key-password key-file dh-file ;
         <planet> <login-config> <factor-boilerplate> "planet" add-responder
         <mason-app> <login-config> <factor-boilerplate> "mason" add-responder
         "/tmp/docs/" <help-webapp> "docs" add-responder
-    test-db <alloy>
+    website-db <alloy>
     main-responder set-global ;
 
 : <gitweb> ( path -- responder )
@@ -106,10 +106,10 @@ SYMBOLS: key-password key-file dh-file ;
         <concatenative-website>
             <wiki> "wiki" add-responder
             <user-admin> "user-admin" add-responder
-        <login-config> <factor-boilerplate> test-db <alloy> "concatenative.org" add-responder
-        <pastebin> <factor-recaptcha> <login-config> <factor-boilerplate> test-db <alloy> "paste.factorcode.org" add-responder
-        <planet> <login-config> <factor-boilerplate> test-db <alloy> "planet.factorcode.org" add-responder
-        <mason-app> <login-config> <factor-boilerplate> test-db <alloy> "builds.factorcode.org" add-responder
+        <login-config> <factor-boilerplate> website-db <alloy> "concatenative.org" add-responder
+        <pastebin> <factor-recaptcha> <login-config> <factor-boilerplate> website-db <alloy> "paste.factorcode.org" add-responder
+        <planet> <login-config> <factor-boilerplate> website-db <alloy> "planet.factorcode.org" add-responder
+        <mason-app> <login-config> <factor-boilerplate> website-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
     main-responder set-global ;
@@ -127,7 +127,7 @@ SYMBOLS: key-password key-file dh-file ;
         8431 >>secure ;
 
 : start-website ( -- server )
-    test-db start-expiring
-    test-db start-update-task
+    website-db start-expiring
+    website-db start-update-task
     http-insomniac
     <concatenative-website-server> start-server ;