Upstream 2019 01 14

.gitignore

@@ -5,3 +5,5 @@ secrets/
 build
 docker-compose.yml
 .transifexrc
+.idea/
+*.override.yml

README.md

@@ -7,7 +7,7 @@ Once this is noted, you can `docker-compose stop` and search for potentially-mis
 
 # kobo-docker
 
-`kobo-docker` is used to run a copy of the [KoBo Toolbox](http://www.kobotoolbox.org) survey data collection platform on a machine of your choosing. It relies [Docker](https://docker.com) to separate the different parts of KoBo into different containers (which can be thought of as lighter-weight virtual machines) and [Docker Compose](https://docs.docker.com/compose/) to configure, run, and connect those containers. Below is a diagram (made with [Lucidchart](lucidchart.com)) of the containers that make up a running `kobo-docker` system and their connections:
+`kobo-docker` is used to run a copy of the [KoBo Toolbox](http://www.kobotoolbox.org) survey data collection platform on a machine of your choosing. It relies on [Docker](https://docker.com) to separate the different parts of KoBo into different containers (which can be thought of as lighter-weight virtual machines) and [Docker Compose](https://docs.docker.com/compose/) to configure, run, and connect those containers. Below is a diagram (made with [Lucidchart](lucidchart.com)) of the containers that make up a running `kobo-docker` system and their connections:
 ![Container diagram](./doc/Container_diagram.png)
 
 
@@ -42,6 +42,12 @@ Once this is noted, you can `docker-compose stop` and search for potentially-mis
 
 11. Start the server: `docker-compose up -d` (or without the `-d` option to run in the foreground).
 
+11 - Bugfix. # FORM DEPLOYMENT BUG PLEASE BE ADVICED - AS FROM 10/04/2018: (should be removed when fixed)
+If you start the kobo-docker framework the first time you have to set the permission of the media-folder correctly.
+otherwise form deployment as well as project creation will fail:
+Please run the following command inside your kobo-docker folder:
+`docker-compose exec kobocat chown -R wsgi /srv/src/kobocat`
+
 12. Container output can be followed with `docker-compose logs -f`. For an individual container, logs can be followed by using the container name from your `docker-compose.yml` with e.g. `docker-compose logs -f enketo_express`.
 
 "Local" setup users can now reach KoBo Toolbox at `http://${HOST_ADDRESS}:${KPI_PUBLIC_PORT}` (substituting in the values entered in [`envfile.local.txt`](./envfile.local.txt)), while "server" setups can be reached at `https://${KOBOFORM_PUBLIC_SUBDOMAIN}.${PUBLIC_DOMAIN_NAME}` (similarly substituting from [`envfile.server.txt`](./envfile.server.txt)). Be sure to periodically update your containers, especially `nginx`, for security updates by pulling new changes from this `kobo-docker` repo then running e.g. `docker-compose pull && docker-compose up -d`.

docker-compose.local.yml

@@ -96,6 +96,7 @@ kpi:
     - mongo
   volumes:
     - ./.vols/static/kpi:/srv/static
+    - ./.vols/kpi_media:/srv/src/kpi/media
     # The Whoosh search index needs persistent storage
     - ./.vols/whoosh:/srv/whoosh
     - ./log/kpi:/srv/logs

docker-compose.server.yml

@@ -106,6 +106,7 @@ kpi:
     - mongo
   volumes:
     - ./.vols/static/kpi:/srv/static
+    - ./.vols/kpi_media:/srv/src/kpi/media
     # The Whoosh search index needs persistent storage
     - ./.vols/whoosh:/srv/whoosh
     - ./log/kpi:/srv/logs

enketo_express/config.json

@@ -3,5 +3,10 @@
     "linked form and data server": {
         "name": "KoBo Toolbox",
         "server url": ""
-    }
+    },
+    "widgets": [
+        "note", "select-desktop", "select-mobile", "autocomplete", "geo", "textarea",
+        "table", "radio", "date", "time", "datetime", "compact", "file", "draw",
+        "likert", "distress", "horizontal", "image-view", "comment", "image-map", "date-mobile"
+    ]
 }

envfiles/aws.txt

@@ -27,3 +27,7 @@
 #KOBOCAT_DEFAULT_FILE_STORAGE=storages.backends.s3boto.S3BotoStorage
 # To use S3 for KoBoCAT's storage, the specified bucket must already exist and the owner of your `AWS_ACCESS_KEY_ID` must have the appropriate S3 permissions.
 #KOBOCAT_AWS_STORAGE_BUCKET_NAME=
+
+# KPI also uses media file storage for users' data exports
+#KPI_DEFAULT_FILE_STORAGE=storages.backends.s3boto.S3BotoStorage
+#KPI_AWS_STORAGE_BUCKET_NAME=

envfiles/kobocat.txt

@@ -1,3 +1,7 @@
+# Uncomment the following to require authentication for viewing blank forms and
+# submitting data
+#REQUIRE_AUTHENTICATION_TO_SEE_FORMS_AND_SUBMIT_DATA_DEFAULT=True
+
 KOBOCAT_DJANGO_DEBUG=False
 TEMPLATE_DEBUG=False
 
@@ -9,6 +13,7 @@ KOBO_POSTGRES_USER=kobo
 KOBOCAT_BROKER_URL=amqp://kobocat:kobocat@rabbit:5672/kobocat
 
 #TIME_ZONE=America/New_York
+#KOBOCAT_UWSGI_PROCESS_COUNT=2
 #ENKETO_OFFLINE_SURVEYS=True
 #KOBOCAT_MONGO_HOST=mongo
 #KOBOCAT_MONGO_PORT=27017
@@ -24,6 +29,10 @@ KOBOCAT_BROKER_URL=amqp://kobocat:kobocat@rabbit:5672/kobocat
 #KOBOCAT_DEFAULT_FILE_STORAGE=
 #EMAIL_FILE_PATH=./emails
 
+# Celery task time limits in seconds (affects legacy exports only)
+#CELERYD_TASK_TIME_LIMIT=2100
+#CELERYD_TASK_SOFT_TIME_LIMIT=1800
+
 # 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

envfiles/kpi.txt

@@ -17,6 +17,10 @@ DATABASE_URL=postgres://kobo:kobo@postgres:5432/kobotoolbox
 #KPI_UWSGI_PROCESS_COUNT=2
 #KOBO_SUPPORT_URL=http://support.kobotoolbox.org/
 
+# Celery task time limits in seconds
+#CELERYD_TASK_TIME_LIMIT=2100
+#CELERYD_TASK_SOFT_TIME_LIMIT=1800
+
 # 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

nginx/nginx_site_http.conf.tmpl

@@ -11,7 +11,7 @@ server {
     error_log   /var/log/nginx/kobocat.error.log;
 
     # max upload size
-    client_max_body_size 75M;
+    client_max_body_size 100M;
 
     # Serve locations containing 'submission' or 'formList' via HTTP without
     # further ado, since ODK Collect makes requests containing those terms and
@@ -42,6 +42,8 @@ server {
     access_log  /var/log/nginx/kpi.access.log;
     error_log   /var/log/nginx/kpi.error.log;
 
+    client_max_body_size 100M;
+
     ${kpi_location_static}
 
     error_page 418 = /static/html/Offline.html;

nginx/nginx_site_https.conf.tmpl

@@ -12,6 +12,9 @@ server {
     listen      80;
     server_name ${KOBOCAT_PUBLIC_SUBDOMAIN}.${PUBLIC_DOMAIN_NAME};
 
+    # Support bigger headers. Useful for huge cookies
+    large_client_header_buffers 8 16k;
+
     access_log  /var/log/nginx/kobocat.access.log;
     error_log   /var/log/nginx/kobocat.error.log;
 
@@ -35,7 +38,10 @@ server {
     ssl_ciphers 'AES256+EECDH:AES256+EDH:DHE-RSA-AES128-SHA';
 
     # max upload size
-    client_max_body_size 75M;
+    client_max_body_size 100M;
+
+    # Support bigger headers. Useful for huge cookies
+    large_client_header_buffers 8 16k;
 
     access_log  /var/log/nginx/kobocat.access.log;
     error_log   /var/log/nginx/kobocat.error.log;
@@ -59,6 +65,9 @@ server {
     access_log  /var/log/nginx/kpi.access.log;
     error_log   /var/log/nginx/kpi.error.log;
 
+    # Support bigger headers. Useful for huge cookies
+    large_client_header_buffers 8 16k;
+
     return 301 https://$server_name$request_uri;
 }
 
@@ -70,7 +79,10 @@ server {
     ssl_certificate /tmp/kobo_toolbox_secrets/ssl.crt;
 
     # max upload size
-    client_max_body_size 75M;
+    client_max_body_size 100M;
+
+    # Support bigger headers. Useful for huge cookies
+    large_client_header_buffers 8 16k;
 
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
     ssl_ciphers   'AES256+EECDH:AES256+EDH';
@@ -99,6 +111,9 @@ server {
     access_log  /var/log/nginx/enketo_express.access.log;
     error_log   /var/log/nginx/enketo_express.error.log;
 
+    # Support bigger headers. Useful for huge cookies
+    large_client_header_buffers 8 16k;
+
     return 301 https://$http_host$request_uri;
 }
 
@@ -126,6 +141,9 @@ server {
 
     client_max_body_size 100M;
 
+    # Support bigger headers. Useful for huge cookies
+    large_client_header_buffers 8 16k;
+
     add_header Strict-Transport-Security max-age=63072000;
     #add_header X-Frame-Options DENY;
     add_header X-Content-Type-Options nosniff;

nginx/uwsgi_pass.conf.tmpl

@@ -9,3 +9,7 @@ uwsgi_param HTTP_X_REAL_IP $remote_addr;
 uwsgi_param HTTP_X_FORWARDED_FOR $remote_addr;
 uwsgi_param HTTP_X_FORWARDED_PROTO $scheme;
 include /etc/nginx/uwsgi_params;
+
+# Support longer query strings. See issue #147
+uwsgi_buffers 8 16k;
+uwsgi_buffer_size 16k;