diff --git a/config.py b/config.py index b910662..f48c302 100644 --- a/config.py +++ b/config.py @@ -1,8 +1,8 @@ -# py-scopes/demo/config.py +# loops/config.py +# (used for testing only) from dotenv import load_dotenv from os import getenv -from scopes.server.app import zope_app_factory load_dotenv() @@ -11,7 +11,6 @@ server_port = getenv('SERVER_PORT', '8099') app_factory = zope_app_factory # storage settings -from scopes.storage.db.postgres import StorageFactory dbengine = 'postgresql+psycopg' dbname = getenv('DBNAME', 'demo') dbuser = getenv('DBUSER', 'demo') diff --git a/inst/loops/config.py b/inst/loops/config.py index 02b7939..81f06b4 100644 --- a/inst/loops/config.py +++ b/inst/loops/config.py @@ -11,7 +11,7 @@ server_port = getenv('SERVER_PORT', server_id and getenv(f'SERVER_PORT_{server_id}')) or '8080' shell_pw = (getenv('SHELL_PW', 'dummy')) -loops_path = (getenv('LOOPS_PATH', None)) +loops_path = (getenv('LOOPS_PATH', 'loops/demo')) # storage settings from scopes.storage.db.postgres import StorageFactory diff --git a/inst/loops/env.in b/inst/loops/env.in new file mode 100644 index 0000000..9ed70b8 --- /dev/null +++ b/inst/loops/env.in @@ -0,0 +1,13 @@ +# loops/inst/loops/.env + +SERVER_ID=0 +SERVER_PORT_0=8800 +SERVER_PORT_1=8801 + +SHELL_PW=dummy +LOOPS_PATH=loops/demo + +DBNAME=ccotest +DBUSER=ccotest +DBPASSWORD=cco +DBSCHEMA=loops diff --git a/inst/loops/runserver.sh b/inst/loops/runserver.sh index 446c158..2ce04bd 100755 --- a/inst/loops/runserver.sh +++ b/inst/loops/runserver.sh @@ -2,7 +2,6 @@ set -a # use environment variables for instance-specific configuration: -#ZOPE_CONF=zope-1.conf -#SERVER_PORT=8091 +#SERVER_ID=0 python -c "from loops.server.main import main; main()" diff --git a/inst/loops/zope.conf b/inst/loops/zope.conf index 4d3fb8a..6bfc9de 100644 --- a/inst/loops/zope.conf +++ b/inst/loops/zope.conf @@ -7,8 +7,8 @@ site-definition application.zcml - path var/filestorage/Data.fs - blob-dir var/blob + path var/filestorage/Data.$(SERVER_ID).fs + blob-dir var/blob.$(SERVER_ID) # Uncomment this if you want to connect to a ZEO server instead: