Merge remote-tracking branch 'origin/production' into scale_2_0

openprocurement · Aug 1, 2017 · a0a5c52 · a0a5c52
2 parents 232cfcc + 40ade4b
commit a0a5c52
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/base.cfg b/base.cfg
@@ -12,6 +12,10 @@ package-name =
     openprocurement.tender.competitivedialogue
     openprocurement.circus.plugins
     openprocurement.subscribers.serverid
+    openprocurement.archivarius.core
+    openprocurement.archivarius.contracts
+    openprocurement.archivarius.plans
+    openprocurement.archivarius.tenders
 
 auto-checkout = ${:package-name}
 parts =
@@ -51,6 +55,10 @@ openprocurement.tender.openuadefense = git ${remotes:opgh}.tender.openuadefense.
 openprocurement.tender.competitivedialogue = git ${remotes:opgh}.tender.competitivedialogue.git pushurl=${remotes:opgh_push}.tender.competitivedialogue.git
 openprocurement.circus.plugins = git ${remotes:opgh}.circus.plugins.git pushurl=${remotes:opgh_push}.circus.plugins.git
 openprocurement.subscribers.serverid = git ${remotes:opgh}.subscribers.serverid.git pushurl=${remotes:opgh_push}.subscribers.serverid.git
+openprocurement.archivarius.contracts = git ${remotes:opgh}.archivarius.contracts.git pushurl=${remotes:opgh_push}.archivarius.contracts.git
+openprocurement.archivarius.plans = git ${remotes:opgh}.archivarius.plans.git pushurl=${remotes:opgh_push}.archivarius.plans.git
+openprocurement.archivarius.tenders = git ${remotes:opgh}.archivarius.tenders.git pushurl=${remotes:opgh_push}.archivarius.tenders.git
+openprocurement.archivarius.core = git ${remotes:opgh}.archivarius.core.git pushurl=${remotes:opgh_push}.archivarius.core.git
 
 [config-from-template]
 recipe = collective.recipe.template[genshi]:genshi

diff --git a/production.cfg b/production.cfg
@@ -28,15 +28,19 @@ tenders_api_version = 2.3
 logs_bucket = openprocurement-logs
 
 [versions]
-openprocurement.api = 2.3.47
+openprocurement.api = 2.3.64
 openprocurement.chronograph = 0.6.5
 openprocurement.concord = 0.4
-openprocurement.planning.api = 2.3.8
-openprocurement.tender.limited = 2.3.24
-openprocurement.tender.openeu = 2.3.30
-openprocurement.tender.openua = 2.3.24
-openprocurement.tender.openuadefense = 2.3.24
-openprocurement.tender.competitivedialogue = 1.0.13
-openprocurement.contracting.api = 2.3.20
+openprocurement.planning.api = 2.3.10
+openprocurement.tender.limited = 2.3.26
+openprocurement.tender.openeu = 2.3.34
+openprocurement.tender.openua = 2.3.28
+openprocurement.tender.openuadefense = 2.3.27
+openprocurement.tender.competitivedialogue = 1.0.18
+openprocurement.contracting.api = 2.3.22
+openprocurement.archivarius.core = 1.0
+openprocurement.archivarius.tenders = 1.0
+openprocurement.archivarius.contracts = 1.0
+openprocurement.archivarius.plans = 1.0
 openprocurement-client = 1.0b2
 penstock = 0.2.0
diff --git a/templates/circus.ini b/templates/circus.ini
@@ -32,10 +32,12 @@ stderr_stream.backup_count = ${options['backup_count']}
 [env:db]
 HOME = ${parts.buildout.directory}/var
 
+{% if 'disable_db_resource_watcher' not in options %}
 [plugin:db_resource]
 use = circus.plugins.resource_watcher.ResourceWatcher
 watcher = db
 max_mem = 1700M
+{% end %}
 
 [plugin:db_http]
 use = circus.plugins.http_observer.HttpObserver

diff --git a/templates/openprocurement.api.ini b/templates/openprocurement.api.ini
@@ -30,6 +30,7 @@ aws.secret_key = ${options['aws_secret_key']}
 {% if 'docservice_password' in options %}docservice_password = ${options['docservice_password']}{% end %}
 {% if 'dockey' in options %}dockey = ${options['dockey']}{% end %}
 {% if 'dockeys' in options %}dockeys = ${options['dockeys'].replace('\n','\0')}{% end %}
+{% if 'arch_pubkey' in options %}arch_pubkey = ${options['arch_pubkey']}{% end %}
 {% if 'api_version' in options %}
 api_version = ${options['api_version']}
 {% end %}