Merge branch 'new-env-vars'

kobotoolbox · Jun 28, 2022 · cdcdbe6 · cdcdbe6
2 parents fc590bf + 390b523
commit cdcdbe6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git 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:[email protected]: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://:[email protected]:6390/2
 REDIS_PASSWORD=kobo
+CACHE_URL=redis://:[email protected]:6390/5
+# In bytes, uncomment to cap Redis Cache memory
+# REDIS_CACHE_MAX_MEMORY=
diff --git 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
@@ -7,9 +7,6 @@ ENKETO_VERSION=Express
 KPI_PREFIX=/
 KPI_BROKER_URL=redis://:[email protected]: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