From e895e589f68e663f6072111561e73f0dc6cc71cd Mon Sep 17 00:00:00 2001 From: Leszek Date: Mon, 23 May 2022 17:54:13 +0200 Subject: [PATCH 1/4] temporary env variable --- docker-compose.frontend.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.frontend.yml b/docker-compose.frontend.yml index aa6c7021..ecdbb60b 100644 --- a/docker-compose.frontend.yml +++ b/docker-compose.frontend.yml @@ -56,6 +56,9 @@ services: sysctls: - net.core.somaxconn=2048 environment: + # TEMP we use this temporary keyfile for testing google automatic transcription and translation. + - GOOGLE_APPLICATION_CREDENTIALS=/srv/src/kpi/google_transcribe_keyfile.json + # ENDTEMP - SYNC_KOBOCAT_XFORMS=False # Should be True on at least one frontend environment - KPI_UWSGI_MAX_REQUESTS=512 - KPI_UWSGI_WORKERS_COUNT=2 From 550887f813f0d53df27b5438e3a076784739d37c Mon Sep 17 00:00:00 2001 From: Leszek Date: Mon, 23 May 2022 17:54:46 +0200 Subject: [PATCH 2/4] Revert "temporary env variable" This reverts commit e895e589f68e663f6072111561e73f0dc6cc71cd. --- docker-compose.frontend.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.frontend.yml b/docker-compose.frontend.yml index ecdbb60b..aa6c7021 100644 --- a/docker-compose.frontend.yml +++ b/docker-compose.frontend.yml @@ -56,9 +56,6 @@ services: sysctls: - net.core.somaxconn=2048 environment: - # TEMP we use this temporary keyfile for testing google automatic transcription and translation. - - GOOGLE_APPLICATION_CREDENTIALS=/srv/src/kpi/google_transcribe_keyfile.json - # ENDTEMP - SYNC_KOBOCAT_XFORMS=False # Should be True on at least one frontend environment - KPI_UWSGI_MAX_REQUESTS=512 - KPI_UWSGI_WORKERS_COUNT=2 From e2d2eb532130c6ba893e573e1120173e9563f18f Mon Sep 17 00:00:00 2001 From: Olivier Leger Date: Wed, 15 Jun 2022 16:37:09 -0400 Subject: [PATCH 3/4] Update environment file examples to support new environment variables --- env/envfiles/databases.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/env/envfiles/databases.txt b/env/envfiles/databases.txt index be3239de..f85c5c77 100644 --- a/env/envfiles/databases.txt +++ b/env/envfiles/databases.txt @@ -11,6 +11,8 @@ MONGO_INITDB_ROOT_PASSWORD=kobo MONGO_INITDB_DATABASE=formhub KOBO_MONGO_USERNAME=kobo KOBO_MONGO_PASSWORD=kobo +MONGO_DB_NAME=formhub +MONGO_DB_URL=mongodb://kobo:kobo@mongo.domain.name:27017/formhub # Default MongoDB backup schedule is weekly at 01:00 AM UTC on Sunday. #MONGO_BACKUP_SCHEDULE=0 1 * * 0 @@ -51,3 +53,6 @@ KOBO_POSTGRES_PRIMARY_ENDPOINT=primary.postgres.domain.name REDIS_SESSION_URL=redis://:kobo@redis-cache.kobo.private:6390/2 REDIS_PASSWORD=kobo +CACHE_URL=redis://:kobo@redis-cache.kobo.private:6390/5 +# In bytes, uncomment to cap Redis Cache memory +# REDIS_CACHE_MAX_MEMORY= From 390b5230e91b25afa89e766b99d13d702725d4eb Mon Sep 17 00:00:00 2001 From: Olivier Leger Date: Wed, 15 Jun 2022 16:41:45 -0400 Subject: [PATCH 4/4] Remove deprecated variables --- env/envfiles/kobocat.txt | 8 +------- env/envfiles/kpi.txt | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/env/envfiles/kobocat.txt b/env/envfiles/kobocat.txt index aeda9f64..69298641 100644 --- a/env/envfiles/kobocat.txt +++ b/env/envfiles/kobocat.txt @@ -12,12 +12,6 @@ KOBOCAT_CELERY_LOG_FILE=/srv/logs/celery.log # Mongo values come from mongo.txt -KOBOCAT_MONGO_HOST=mongo.domain.name -#KOBOCAT_MONGO_PORT= -#KOBOCAT_MONGO_NAME= -#KOBOCAT_MONGO_USER= -#KOBOCAT_MONGO_PASS= - #KOBOCAT_MEDIA_URL=media #KOBOCAT_ROOT_URI_PREFIX= #KOBOCAT_TEMPLATES_PATH=../kobocat-template @@ -27,6 +21,6 @@ KOBOCAT_MONGO_HOST=mongo.domain.name #KOBOCAT_DEFAULT_FILE_STORAGE= #EMAIL_FILE_PATH=./emails -# Dev: One or more mappings from PyDev remote debugging machine file paths to `kobocat` container +# Dev: One or more mappings from PyDev remote debugging machine file paths to `kobocat` container # file paths (see https://github.com/kobotoolbox/kobocat/blob/master/docker/setup_pydev.bash). #KOBOCAT_PATH_FROM_ECLIPSE_TO_PYTHON_PAIRS=~/devel/kobocat -> /srv/src/kobocat | ~/.virtualenvs/kobocat/lib/python2.7/site-packages -> /usr/local/lib/python2.7/dist-packages diff --git a/env/envfiles/kpi.txt b/env/envfiles/kpi.txt index 1f2a8dda..9053015f 100644 --- a/env/envfiles/kpi.txt +++ b/env/envfiles/kpi.txt @@ -7,9 +7,6 @@ ENKETO_VERSION=Express KPI_PREFIX=/ KPI_BROKER_URL=redis://:kobo@redis-main.domain.name:6379/1 -KPI_MONGO_HOST=mongo.domain.name - - DJANGO_LANGUAGE_CODES=en fr es ar zh-hans hi ku #DKOBO_PREFIX=False #KOBO_SURVEY_PREVIEW_EXPIRATION=24 @@ -20,6 +17,6 @@ DJANGO_LANGUAGE_CODES=en fr es ar zh-hans hi ku #KOBO_SUPPORT_URL=http://support.kobotoolbox.org/ -# Dev: One or more mappings from PyDev remote debugging machine file paths to `kpi` container file +# Dev: One or more mappings from PyDev remote debugging machine file paths to `kpi` container file # paths (see https://github.com/kobotoolbox/kpi/blob/master/docker/setup_pydev.bash). #KPI_PATH_FROM_ECLIPSE_TO_PYTHON_PAIRS=~/devel/kpi -> /srv/src/kpi | ~/devel/formpack/src/formpack -> /usr/local/lib/python2.7/dist-packages/formpack