Merge branch 'production' into 'master'

Production config

See merge request !2

rest-api-service/app/config.py

@@ -18,8 +18,8 @@ SECRET_KEY = 'InVzZXIxQGdtlsLmNvbSI.YH6iB4wE5dDMNjpf-cX2Q9MIjyY'
 
 dmss_config = dict(host=os.environ.get('ENC_DMSS_HOST', 'localhost'),
                    port=int(os.environ.get('ENC_DMSS_PORT', '27017')),
-                   db=os.environ.get('ENC_DMSS_DB', 'nd_1_11_6_patch_2'))
+                   db=os.environ.get('ENC_DMSS_DB', 'nd_1_11_6_patch_3'))
 
 es_config = dict(host=os.environ.get('ENC_ES_HOST', 'localhost'),
                  port=int(os.environ.get('ENC_ES_PORT', '9200')),
-                 index=os.environ.get('ENC_ES_INDEX', 'nd_1_11_6_patch_2'))
+                 index=os.environ.get('ENC_ES_INDEX', 'nd_1_11_6_patch_3'))

rest-api-service/requirements.txt

@@ -5,7 +5,7 @@ itsdangerous==0.24
 requests==2.18.3
 python3-saml==1.2.3
 pymongo
-Elasticsearch
+elasticsearch==6.2.0
 redis==2.10.5
 rq==0.7.1
 rq-scheduler==0.7.0