Merge remote-tracking branch 'github/morty' into HEAD

2 files changed, 3 insertions, 8 deletions

diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
index fd0ab09..4a595f0 100644
--- a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
+++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service
@@ -7,8 +7,7 @@ Requires=network-online.target
 [Service]
 RestartSec=10
 Restart=always
-EnvironmentFile=/var/sota/sota_provisioning_url.env
-ExecStart=/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --config /usr/lib/sota/sota.toml
+ExecStart=/usr/bin/aktualizr --disable-keyid-validation --config /usr/lib/sota/sota.toml
 
 [Install]
 WantedBy=multi-user.target
diff --git a/recipes-sota/aktualizr/files/sota_autoprov.toml b/recipes-sota/aktualizr/files/sota_autoprov.toml
index 8799553..9fbb093 100644
--- a/recipes-sota/aktualizr/files/sota_autoprov.toml
+++ b/recipes-sota/aktualizr/files/sota_autoprov.toml
@@ -1,9 +1,5 @@
-[device]
-packages_dir = "/tmp/packages_dir"
-certificates_directory = "/var/sota"
-system_info = "system_info.sh"
-
 [tls]
+certificates_directory = "/var/sota/"
 ca_file = "root.crt"
 client_certificate = "client.pem"
 pkey_file = "pkey.pem"
@@ -14,5 +10,5 @@ private_key_path = "ecukey.der"
 public_key_path = "ecukey.pub"
 
 [provision]
-p12_path = "sota_provisioning_credentials.p12"
+provision_path = "/var/sota/sota_provisioning_credentials.zip"