Enh/switch for studies access (#981)

- Normalizes .env-devel
- Adds switch for studies access WEBSERVER_STUDIES_ACCESS_ENABLED
- Removed cat from Makefile since it does not work in windows

Author: pcrespov

.env-devel

@@ -13,42 +13,46 @@ GF_SMTP_HOST=mail.speag.com:25
 
 MAINTENANCE_PASSWORD=z43
 
-PUBLISHED_HOST_NAME=localhost
-
-POSTGRES_ENDPOINT=postgres:5432
-POSTGRES_USER=simcore
-POSTGRES_PASSWORD=simcore
 POSTGRES_DB=simcoredb
+POSTGRES_ENDPOINT=postgres:5432
+# ensure consistency with POSTGRES_ variables: postgresql+psycopg2://{user}:{password}@{host}:{port}/{database}
+POSTGRES_EXPORTER_DATA_SOURCE_NAME=postgresql://simcore:simcore@postgres:5432/simcoredb?sslmode=disable
 POSTGRES_HOST=postgres
+POSTGRES_PASSWORD=simcore
 POSTGRES_PORT=5432
+POSTGRES_USER=simcore
 
-# ensure consistency with POSTGRES_ variables: postgresql+psycopg2://{user}:{password}@{host}:{port}/{database}
-POSTGRES_EXPORTER_DATA_SOURCE_NAME=postgresql://simcore:simcore@postgres:5432/simcoredb?sslmode=disable
+PUBLISHED_HOST_NAME=localhost
 
-RABBIT_HOST=rabbit
-RABBIT_PORT=5672
 RABBITMQ_USER=simcore
+RABBITMQ_LOG_CHANNEL=comp.backend.channels.log
 RABBITMQ_PASSWORD=simcore
 RABBITMQ_PROGRESS_CHANNEL=comp.backend.channels.progress
-RABBITMQ_LOG_CHANNEL=comp.backend.channels.log
 
-STORAGE_ENDPOINT=storage:8080
+RABBIT_HOST=rabbit
+RABBIT_PORT=5672
+
 
-REGISTRY_URL=masu.speag.com
 REGISTRY_AUTH=True
-REGISTRY_USER=z43
 REGISTRY_PW=z43
 REGISTRY_SSL=True
+REGISTRY_URL=masu.speag.com
+REGISTRY_USER=z43
+
 
-S3_ENDPOINT=minio:9000
 S3_ACCESS_KEY=12345678
-S3_SECRET_KEY=12345678
 S3_BUCKET_NAME=simcore
+S3_ENDPOINT=minio:9000
+S3_SECRET_KEY=12345678
 S3_SECURE=0
 
+
 SMTP_HOST=mail.speag.com
 SMTP_PORT=25
 
+STORAGE_ENDPOINT=storage:8080
+
 WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED=1
 # python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())"
 WEBSERVER_SESSION_SECRET_KEY=REPLACE ME with a key of at least length 32.
+WEBSERVER_STUDIES_ACCESS_ENABLED=0

Makefile

@@ -136,13 +136,11 @@ up-devel: up-swarm-devel
 up-swarm: .env docker-swarm-check
 	${DOCKER} swarm init
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose-tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml ;
-	@cat $(TEMPCOMPOSE).tmp-compose.yml
 	@${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
 
 up-swarm-devel: .env docker-swarm-check $(CLIENT_WEB_OUTPUT)
 	${DOCKER} swarm init
 	${DOCKER_COMPOSE} -f services/docker-compose.yml -f services/docker-compose.devel.yml -f services/docker-compose-tools.yml config > $(TEMPCOMPOSE).tmp-compose.yml
-	@cat $(TEMPCOMPOSE).tmp-compose.yml
 	@${DOCKER} stack deploy -c $(TEMPCOMPOSE).tmp-compose.yml ${SWARM_STACK_NAME}
 
 .PHONY: up-webclient-devel

services/web/server/src/simcore_service_webserver/application_config.py

@@ -45,7 +45,7 @@ def create_schema():
             "client_outdir": T.String(),
             "log_level": T.Enum(*logging._nameToLevel.keys()), # pylint: disable=protected-access
             "testing": T.Bool(),
-            "studies_access_enabled": T.Bool(),
+            T.Key("studies_access_enabled", default=False): T.Or(T.Bool(), T.Int),
             T.Key("monitoring_enabled", default=False): T.Or(T.Bool(), T.Int), # Int added to use environs
         }),
         db_config.CONFIG_SECTION_NAME: db_config.schema,

services/web/server/src/simcore_service_webserver/config/server-docker-prod.yaml

@@ -7,7 +7,7 @@ main:
   client_outdir: ${SIMCORE_WEB_OUTDIR}
   log_level: ${WEBSERVER_LOGLEVEL}
   testing: False
-  studies_access_enabled: False
+  studies_access_enabled: ${WEBSERVER_STUDIES_ACCESS_ENABLED}
   monitoring_enabled: ${WEBSERVER_MONITORING_ENABLED}
 director:
   host: ${DIRECTOR_HOST}