Skip to content

Commit

Permalink
Merge pull request #1169 from ITISFoundation/FREEZE_xxxx
Browse files Browse the repository at this point in the history
FREEZE xxxx
  • Loading branch information
sanderegg authored Nov 19, 2019
2 parents 5a2f05f + 0513c82 commit 828939e
Show file tree
Hide file tree
Showing 124 changed files with 1,597 additions and 1,034 deletions.
23 changes: 4 additions & 19 deletions .env-devel
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,33 @@
BF_API_KEY=none
BF_API_SECRET=none

DOCKER_IMAGE_TAG=latest
DOCKER_VOLUME_POSTGRES_DATA=/path/to/backuped/data

GF_SECURITY_ADMIN_PASSWORD=z43
GF_SMTP_HOST=mail.speag.com:25

MAINTENANCE_PASSWORD=z43

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_PASSWORD=adminadmin
POSTGRES_PORT=5432
POSTGRES_USER=simcore

PUBLISHED_HOST_NAME=localhost
POSTGRES_USER=scu

RABBITMQ_USER=simcore
RABBITMQ_USER=admin
RABBITMQ_LOG_CHANNEL=comp.backend.channels.log
RABBITMQ_PASSWORD=simcore
RABBITMQ_PASSWORD=adminadmin
RABBITMQ_PROGRESS_CHANNEL=comp.backend.channels.progress

RABBIT_HOST=rabbit
RABBIT_PORT=5672


REGISTRY_AUTH=True
REGISTRY_PW=adminadmin
REGISTRY_SSL=True
REGISTRY_URL=masu.speag.com
REGISTRY_USER=admin


S3_ACCESS_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

Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Order is important. The last matching pattern has the most precedence.

# files and folders recursively
Makefile @pcrespov
Makefile @pcrespov, @sanderegg
/.travis.yml @sanderegg
/api/ @sanderegg, @pcrespov
/ops/ @sanderegg, @pcrespov
/ci/ @sanderegg, @pcrespov
/docs/ @pcrespov
/packages/service-library @pcrespov
/scripts/demo @odeimaiz, @pcrespov
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,15 @@ pytest.ini
# Any output directory
*output/
itisfoundation.github.io/
TODO.*

# backup files
*~
*.bak

# pylint-profile output
prof/
!ops/**/build
!ops/**/build

# outputs from make
.stack-*.yml
Loading

0 comments on commit 828939e

Please sign in to comment.