From 53307024e1845c4717be7eb8b8735e493ec4535d Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 19 Jul 2017 14:05:48 +0200 Subject: Call garage-push directly with zip file instead of sending unzipped contents. Warn if older credential environment variables are set. They are now ignored since the credentials aren't unpacked during building. --- recipes-sota/aktualizr/files/aktualizr-autoprovision.service | 3 +-- recipes-sota/aktualizr/files/sota_autoprov.toml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'recipes-sota/aktualizr/files') 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..9d4ce3b 100644 --- a/recipes-sota/aktualizr/files/sota_autoprov.toml +++ b/recipes-sota/aktualizr/files/sota_autoprov.toml @@ -1,9 +1,9 @@ [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 +14,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" -- cgit v1.2.3-54-g00ecf From e59b7e959695a31b109b873e7de420cf947e22b8 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 8 Aug 2017 17:36:20 +0200 Subject: Remove device section as it is no longer used. --- recipes-sota/aktualizr/files/sota_autoprov.toml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'recipes-sota/aktualizr/files') diff --git a/recipes-sota/aktualizr/files/sota_autoprov.toml b/recipes-sota/aktualizr/files/sota_autoprov.toml index 9d4ce3b..9fbb093 100644 --- a/recipes-sota/aktualizr/files/sota_autoprov.toml +++ b/recipes-sota/aktualizr/files/sota_autoprov.toml @@ -1,7 +1,3 @@ -[device] -packages_dir = "/tmp/packages_dir" -system_info = "system_info.sh" - [tls] certificates_directory = "/var/sota/" ca_file = "root.crt" -- cgit v1.2.3-54-g00ecf