diff --git a/base.cfg b/base.cfg index e47c1ca..f330ffb 100644 --- a/base.cfg +++ b/base.cfg @@ -92,9 +92,9 @@ logfile = ${buildout:directory}/var/log/redis.log <= config-from-template debug = false auth_file = ${buildout:directory}/auth.ini +keys_file = ${buildout:directory}/keys.yaml exc_logger = 1 edr_api_host = https://zqedr-api.nais.gov.ua -edr_api_token = token edr_api_port = 443 edr_timeout_min = 1 edr_timeout_max = 60 diff --git a/templates/circus.ini b/templates/circus.ini index 600aea0..6a719c4 100644 --- a/templates/circus.ini +++ b/templates/circus.ini @@ -14,7 +14,7 @@ statsd = ${options['statsd']} [env] TZ = ${options['timezone']} {% if 'sandbox_mode' in options %} -SANDBOX_MODE = true +SANDBOX_MODE = ${options['sandbox_mode']} {% end %} {% if options['webapp'] %} diff --git a/templates/openprocurement.integrations.edr.ini b/templates/openprocurement.integrations.edr.ini index dc6f9e0..1ffd9a1 100644 --- a/templates/openprocurement.integrations.edr.ini +++ b/templates/openprocurement.integrations.edr.ini @@ -4,13 +4,13 @@ pipeline = request_id api [app:api] use = egg:openprocurement.integrations.edr edr_api_server = ${options['edr_api_host']} -edr_api_token = ${options['edr_api_token']} edr_api_port = ${options['edr_api_port']} edr_timeout_min = ${options['edr_timeout_min']} edr_timeout_max = ${options['edr_timeout_max']} edr_timeout_step = ${options['edr_timeout_step']} edr_timeout_mode = ${options['edr_timeout_mode']} auth.file = ${options['auth_file']} +keys.file = ${options['keys_file']} pyramid.reload_templates = ${options['debug']} pyramid.debug_authorization = false pyramid.debug_notfound = false diff --git a/versions.cfg b/versions.cfg index a3725cc..d5ae2a0 100644 --- a/versions.cfg +++ b/versions.cfg @@ -150,4 +150,9 @@ greenlet = 0.4.12 pyramid-exclog = 1.0 # Added by buildout at 2017-07-25 14:05:09.397926 -z3c.recipe.mkdir = 0.6 \ No newline at end of file +z3c.recipe.mkdir = 0.6 +# Added by buildout at 2017-08-07 11:03:38.416920 + +# Required by: +# openprocurement.integrations.edr==1.0.0 +redis = 2.10.5