From 2198d9e40963fed8b6b844fdaeb9c90bfcace23e Mon Sep 17 00:00:00 2001 From: QX Teo <37101453+qx-teo@users.noreply.github.com> Date: Wed, 27 Oct 2021 00:01:45 -0400 Subject: [PATCH] Add delivery Add delivery dir to CAN, Quidel, USAFacts Also change export_dir to ./receiving so that gating can take place --- ansible/templates/covid_act_now-params-prod.json.j2 | 7 +++++-- ansible/templates/quidel_covidtest-params-prod.json.j2 | 5 ++++- ansible/templates/usafacts-params-prod.json.j2 | 5 ++++- covid_act_now/params.json.template | 3 +++ quidel_covidtest/params.json.template | 3 +++ usafacts/params.json.template | 3 +++ 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ansible/templates/covid_act_now-params-prod.json.j2 b/ansible/templates/covid_act_now-params-prod.json.j2 index 13b116072..5bb2eeaf9 100644 --- a/ansible/templates/covid_act_now-params-prod.json.j2 +++ b/ansible/templates/covid_act_now-params-prod.json.j2 @@ -1,6 +1,6 @@ { "common": { - "export_dir": "/common/covidcast/receiving/covid-act-now", + "export_dir": "./receiving", "log_filename": "/var/log/indicators/covid_act_now.log" }, "indicator": { @@ -44,5 +44,8 @@ "smoothed_signals": [ ] } - } + }, + "delivery": { + "delivery_dir": "/common/covidcast/receiving/covid-act-now" + } } diff --git a/ansible/templates/quidel_covidtest-params-prod.json.j2 b/ansible/templates/quidel_covidtest-params-prod.json.j2 index 6047b0469..35119ad02 100644 --- a/ansible/templates/quidel_covidtest-params-prod.json.j2 +++ b/ansible/templates/quidel_covidtest-params-prod.json.j2 @@ -1,6 +1,6 @@ { "common": { - "export_dir": "/common/covidcast/receiving/quidel", + "export_dir": "./receiving", "log_filename": "/var/log/indicators/quidel_covidtest.log" }, "indicator": { @@ -47,5 +47,8 @@ "covid_ag_smoothed_pct_positive" ] } + }, + "delivery": { + "delivery_dir": "/common/covidcast/receiving/quidel" } } diff --git a/ansible/templates/usafacts-params-prod.json.j2 b/ansible/templates/usafacts-params-prod.json.j2 index e56b7020c..e796868e7 100644 --- a/ansible/templates/usafacts-params-prod.json.j2 +++ b/ansible/templates/usafacts-params-prod.json.j2 @@ -1,6 +1,6 @@ { "common": { - "export_dir": "/common/covidcast/receiving/usa-facts", + "export_dir": "./receiving", "input_dir": "./input-cache", "log_filename": "/var/log/indicators/usafacts.log" }, @@ -48,5 +48,8 @@ "deaths_7dav_incidence_num", "deaths_7dav_incidence_prop"] } + }, + "delivery": { + "delivery_dir": "/common/covidcast/receiving/usa-facts" } } diff --git a/covid_act_now/params.json.template b/covid_act_now/params.json.template index e6181f96c..67e271c10 100644 --- a/covid_act_now/params.json.template +++ b/covid_act_now/params.json.template @@ -44,5 +44,8 @@ "smoothed_signals": [ ] } + }, + "delivery": { + "delivery_dir": "./receiving" } } \ No newline at end of file diff --git a/quidel_covidtest/params.json.template b/quidel_covidtest/params.json.template index 49649c9ff..a2996b032 100644 --- a/quidel_covidtest/params.json.template +++ b/quidel_covidtest/params.json.template @@ -48,5 +48,8 @@ "covid_ag_smoothed_pct_positive" ] } + }, + "delivery": { + "delivery_dir": "./receiving" } } diff --git a/usafacts/params.json.template b/usafacts/params.json.template index 8df7ab28a..68594fdc7 100644 --- a/usafacts/params.json.template +++ b/usafacts/params.json.template @@ -49,5 +49,8 @@ "deaths_7dav_incidence_num", "deaths_7dav_incidence_prop"] } + }, + "delivery": { + "delivery_dir": "./receiving" } }