fix settings for loops and bluebream example instances

.gitignore

@@ -9,5 +9,6 @@ var/
 *.ropeproject
 *.sublime-project
 *.sublime-workspace
+.env
 .settings
 adminuser.zcml

inst/bluebream/application.zcml

@@ -6,8 +6,6 @@
 
   <include file="adminuser.zcml" />
 
-  <includeOverrides package="loops" file="overrides.zcml" />
-
   <includeOverrides file="overrides.zcml" />
 
 </configure>

inst/bluebream/config.py

@@ -7,10 +7,3 @@ load_dotenv()
 
 server_port = getenv('SERVER_PORT', '8099')
 
-# storage settings
-from scopes.storage.db.postgres import StorageFactory
-dbengine = 'postgresql+psycopg'
-dbname = getenv('DBNAME', 'demo')
-dbuser = getenv('DBUSER', 'demo')
-dbpassword = getenv('DBPASSWORD', 'secret')
-dbschema = getenv('DBSCHEMA', 'demo')

inst/bluebream/zope.conf

@@ -28,7 +28,7 @@ site-definition application.zcml
   # the tokens STDOUT or STDERR.
 
   <logfile>
-    path var/log/z3-deploy.log
+    path var/log/bluebream.log
     formatter zope.exceptions.log.Formatter
   </logfile>
 

inst/loops/.env

@@ -1,8 +0,0 @@
-# loops/inst/bluebream/.env
-
-SERVER_PORT=8800
-
-DBNAME=ccotest
-DBUSER=ccotest
-DBPASSWORD=cco
-DBSCHEMA=testing

inst/loops/application.zcml

@@ -4,6 +4,8 @@
 
   <include package="loops" file="securitypolicy.zcml" />
 
+  <module module="loops.patch" />
+
   <include file="adminuser.zcml" />
 
   <include package="cybertools" />
@@ -19,13 +21,6 @@
   <!--<include package="cco.schema" />
   <include package="cco.skin.r2" />
   <include package="cco.webapi" />
-  <include package="ccq.cqportal" />
-  <include package="ccq.misc" />
-  <include package="custom.bwp" />
-  <include package="custom.brunold" />
-  <include package="custom.bwpsites" />
-  <include package="custom.cyberconcepts" />
-  <include package="custom.omk" />
   <include package="cyberapps.ccmkg" />
   <include package="cyberapps.knowledge" />-->
 

inst/loops/config.py

@@ -15,7 +15,7 @@ loops_path = (getenv('LOOPS_PATH', 'loops/demo'))
 
 # storage settings
 from scopes.storage.db.postgres import StorageFactory
-dbengine = 'postgresql+psycopg'
+dbengine = getenv('DBENGINE', 'postgresql+psycopg')
 dbname = getenv('DBNAME', 'demo')
 dbuser = getenv('DBUSER', 'demo')
 dbpassword = getenv('DBPASSWORD', 'secret')

inst/loops/env.in

@@ -2,12 +2,11 @@
 
 SERVER_ID=0
 SERVER_PORT_0=8800
-SERVER_PORT_1=8801
 
 SHELL_PW=dummy
-LOOPS_PATH=loops/demo
+LOOPS_PATH=demo
 
-DBNAME=ccotest
+DBNAME=loops
-DBUSER=ccotest
+DBUSER=demouser
-DBPASSWORD=cco
+DBPASSWORD=dummy
-DBSCHEMA=loops
+DBSCHEMA=demo