resolve conflicts

tosdr · Apr 5, 2024 · a7af46d · a7af46d
2 parents 8dad717 + 75c3421
commit a7af46d
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 7 deletions.
diff --git a/config/production.json b/config/production.json
@@ -32,6 +32,12 @@
       "updateTemplateId": 0
     }
   },
+  "logger": {
+    "smtp": {
+      "host": "smtp.sendgrid.net",
+      "username": "tosdr-bot"
+    }
+  },
   "reporter": {
     "githubIssues": {
       "repositories": {

diff --git a/deployment/inventory.yml b/deployment/inventory.yml
@@ -3,3 +3,58 @@ all:
     51.195.149.220:
       ansible_user: debian
       ed25519_fingerprint: AAAAC3NzaC1lZDI1NTE5AAAAIPdUmZiOSEsgrXI9hsW6EsIHdMzLXbQOVdi2OFVfzF8e
+      ota_engine_github_bot_private_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          61323031666636646563616264363735646639343738666561633862653165333764656337316131
+          3965333137313836343562363734653062653964313435650a393033623431373931306338636436
+          37656362666431653834303361646637303161653636323266343732336238336636616562346261
+          3737613261333035380a623230343033353065323362343335623762623737383633386333373933
+          38613038636661353266326436623232336435616561353435326562306435333937393731353262
+          38386433326564323632633238626466613739376466393532343433303964313265656636306437
+          37663363316233386363326161303436396639633661656434613466346465636438333465383262
+          62656638373336346431626262366162333239366432666135306539313431393766333333396362
+          35373465653237333566656438343635353532303837333734386363313865616234373766633931
+          31613637616134383464626338326237323662656234386430613566363836633930643034643630
+          32366532656532326565333966343739646464393839393531346364313430323437356464353430
+          33333339373662383636343238616332633361613865623838323638356130336437336463633563
+          33646236386438393465323634666534356537376465663939333032666564316562396262383635
+          38653163646562353633643065623831333536306165373261323061383730663830656238326530
+          32636335356265633238376265303738323135633966633938646338653162386630363964663461
+          38393063336434346531313261633637333365613264613264666662646333313031386635633734
+          32323735663135396565663864643761326362393766633133343835643663636566373461353763
+          63646666626361366665363061633161626232646639343063303136343739666663663639303534
+          34353361363234666161316561323136313562363965623530376566646634346666643431356362
+          31306364346537396332333933616333393837636632613365353434313438303363336365393633
+          34613331366335663631353034626438356239613231366464623730626639616231646663643338
+          61333736643634616637353664353335313465353466383237656330363433646365643764643363
+          31633538633064626137643837626362386465393531343063653461326439643931333463306262
+          61633439633033643936393563633235356162336337376263636462663466663639616634373165
+          32326266313061376663623965353331343163396332333238613566656361393233
+      ota_engine_github_token: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          61343735373537323862633634353566386161373930656663363734623533323839383130613237
+          3565623033363264663534656330333231613731333436610a663335653836366537343965376339
+          30356536643064383366373937333964323662623939313236323862623938363239313966373136
+          3838653662376166630a366566633931663936626661343363336231653764343730633164643064
+          36363061323232626164643764353433306437646138373639356333326639363737366435646134
+          3763643538626263313838653836306630326666643236623533
+      ota_engine_smtp_password !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          66623561343934623530303961343963363133303563386237323236396532636537343066383265
+          3734313661346135393735306462346363396564363762630a623939323065386361366161653365
+          38313233613133386135343166343035366538363263313263393037333738613732326666383862
+          3664373432653236370a643332373165653736343532663031306138343239636234616661336439
+          63356638623266376465383366383837383765633338633564383461653738646239303339373766
+          39376130343365343136626165633533616637663363663065613731326137316131376464323136
+          39636238633063313431323663623265353639656136313133386633326263343366623265323465
+          63303662383061383831
+      ota_federated_api_smtp_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          66623561343934623530303961343963363133303563386237323236396532636537343066383265
+          3734313661346135393735306462346363396564363762630a623939323065386361366161653365
+          38313233613133386135343166343035366538363263313263393037333738613732326666383862
+          3664373432653236370a643332373165653736343532663031306138343239636234616661336439
+          63356638623266376465383366383837383765633338633564383461653738646239303339373766
+          39376130343365343136626165633533616637663363663065613731326137316131376464323136
+          39636238633063313431323663623265353639656136313133386633326263343366623265323465
+          63303662383061383831
diff --git a/deployment/requirements.yml b/deployment/requirements.yml
@@ -1,4 +1,4 @@
 ---
 collections:
 - name: opentermsarchive.deployment
-  version: 0.0.16
+  version: 1.1.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "dataset:schedule": "npm run dataset -- --publish --remove-local-copy --schedule"
   },
   "dependencies": {
-    "@opentermsarchive/engine": "~0.34.0",
+    "@opentermsarchive/engine": "~1.1.0",
     "@opentermsarchive/terms-types": "tosdr/terms-types#main",
     "xpath-to-css": "^1.1.0"
   }