databroker client TLS configuration rework

Changes:
- Bump SRCREVs for agl-service-audiomixer, agl-service-hvac, and
  libqtappfw to pick up server hostname and TLS configuration
  changes.
- Update databroker configuration in the configuration files for the
  service daemons and libqtappfw users to add the now required
  explicit TLS configuration.
- Fixed server hostname option in Qt cluster dashboard gateway demo
  conf file just in case it ever is required.

Bug-AGL: SPEC-5387, SPEC-5388

Change-Id: I84925b7a5e78268e047d421cc718ae79ed5028b4
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30904
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account
(cherry picked from commit b58af552093b4427253911956705420449b87fa0)
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30872
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.default b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.default
index e0d84f8..eb173aa 100644 (file)
--- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.default
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.default
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/agl-service-audiomixer/agl-service-audiomixer.token"

diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.gateway-demo b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.gateway-demo
index c6095ac..a05513d 100644 (file)
--- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.gateway-demo
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer/agl-service-audiomixer.conf.gateway-demo
@@ -1,4 +1,6 @@
 [kuksa-client]
 hostname = "192.168.10.4"
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 tls-server-name = "localhost"
 authorization = "/etc/xdg/AGL/agl-service-audiomixer/agl-service-audiomixer.token"

diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
index 8f591cb..204edaa 100644 (file)
--- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
@@ -26,7 +26,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-audiomixer.g
            file://agl-service-audiomixer.service \
            file://databroker.conf \
 "
-SRCREV  = "2e7d2c7a4d9c6dd37552c69a896286aa7dacd2c3"
+SRCREV  = "b10a13b5e1deb4fb66a37e3b3487df1208a80771"
 
 PV = "2.0+git${SRCPV}"
 S  = "${WORKDIR}/git"

diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.default b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.default
index ca2f4f6..ae8031a 100644 (file)
--- a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.default
+++ b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.default
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/agl-service-hvac/agl-service-hvac.token"

diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.gateway-demo b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.gateway-demo
index 929bbc1..4cb88db 100644 (file)
--- a/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.gateway-demo
+++ b/recipes-demo/agl-service-hvac/agl-service-hvac/agl-service-hvac.conf.gateway-demo
@@ -1,4 +1,6 @@
 [kuksa-client]
 hostname = "192.168.10.4"
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 tls-server-name = "localhost"
 authorization = "/etc/xdg/AGL/agl-service-hvac/agl-service-hvac.token"

diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb
index f7a6eb9..01c46ef 100644 (file)
--- a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb
+++ b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb
@@ -24,7 +24,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-hvac;protoco
            file://agl-service-hvac.service \
            file://databroker.conf \
 "
-SRCREV  = "1f55937667e35fb79dabee0e180787e34a59169a"
+SRCREV  = "382476d83dbd22469a9c3ad631073909616fb1bb"
 
 PV = "2.0+git${SRCPV}"
 S  = "${WORKDIR}/git"

diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.default b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.default
index 8d73b32..57b597c 100644 (file)
--- a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.default
+++ b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.default
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token"

diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.demo b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.demo
index 87fc79a..5048c49 100644 (file)
--- a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.demo
+++ b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf.demo
@@ -1,4 +1,6 @@
 [kuksa-client]
-server = "192.168.10.2"
+hostname = "192.168.10.2"
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 tls-server-name = "localhost"
 authorization = "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token"

diff --git a/recipes-demo/homescreen/files/homescreen.conf b/recipes-demo/homescreen/files/homescreen.conf
index d3998d9..b2d9a67 100644 (file)
--- a/recipes-demo/homescreen/files/homescreen.conf
+++ b/recipes-demo/homescreen/files/homescreen.conf
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/homescreen/homescreen.token"

diff --git a/recipes-demo/hvac/hvac/hvac.conf b/recipes-demo/hvac/hvac/hvac.conf
index dfecdc5..d0a4e80 100644 (file)
--- a/recipes-demo/hvac/hvac/hvac.conf
+++ b/recipes-demo/hvac/hvac/hvac.conf
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/hvac/hvac.token"

diff --git a/recipes-demo/libqtappfw/libqtappfw_git.bb b/recipes-demo/libqtappfw/libqtappfw_git.bb
index 3c40de1..bc89d51 100644 (file)
--- a/recipes-demo/libqtappfw/libqtappfw_git.bb
+++ b/recipes-demo/libqtappfw/libqtappfw_git.bb
@@ -22,7 +22,7 @@ DEPENDS = " \
 "
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/libqtappfw;protocol=https;branch=${AGL_BRANCH}"
-SRCREV  = "4f75c049e8ba1e7fd4f1094f9ed8b681318f021d"
+SRCREV  = "e9788d352a24b07f52d4b7c532cb29bc36cb795c"
 S       = "${WORKDIR}/git"
 
 # PV needs to be modified with SRCPV to work AUTOREV correctly

diff --git a/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf
index ef4021f..5013833 100644 (file)
--- a/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf
+++ b/recipes-demo/mediaplayer/mediaplayer/mediaplayer.conf
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/mediaplayer/mediaplayer.token"

diff --git a/recipes-demo/navigation/ondemandnavi/navigation.conf b/recipes-demo/navigation/ondemandnavi/navigation.conf
index 00905f7..f2ec14a 100644 (file)
--- a/recipes-demo/navigation/ondemandnavi/navigation.conf
+++ b/recipes-demo/navigation/ondemandnavi/navigation.conf
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/navigation/navigation.token"

diff --git a/recipes-demo/navigation/ondemandnavi/navigation.conf.gateway-demo b/recipes-demo/navigation/ondemandnavi/navigation.conf.gateway-demo
index ed71a49..8fbd6cc 100644 (file)
--- a/recipes-demo/navigation/ondemandnavi/navigation.conf.gateway-demo
+++ b/recipes-demo/navigation/ondemandnavi/navigation.conf.gateway-demo
@@ -1,4 +1,6 @@
 [kuksa-client]
 hostname = "192.168.10.4"
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 tls-server-name = "localhost"
 authorization = "/etc/xdg/AGL/navigation/navigation.token"

diff --git a/recipes-demo/navigation/ondemandnavi/navigation.conf.kvm-demo b/recipes-demo/navigation/ondemandnavi/navigation.conf.kvm-demo
index 6da2579..4143abf 100644 (file)
--- a/recipes-demo/navigation/ondemandnavi/navigation.conf.kvm-demo
+++ b/recipes-demo/navigation/ondemandnavi/navigation.conf.kvm-demo
@@ -1,4 +1,6 @@
 [kuksa-client]
 hostname = "172.16.10.1"
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 tls-server-name = "localhost"
 authorization = "/etc/xdg/AGL/navigation/navigation.token"

diff --git a/recipes-demo/navigation/tbtnavi/tbtnavi.conf b/recipes-demo/navigation/tbtnavi/tbtnavi.conf
index a6e9713..4d95d1f 100644 (file)
--- a/recipes-demo/navigation/tbtnavi/tbtnavi.conf
+++ b/recipes-demo/navigation/tbtnavi/tbtnavi.conf
@@ -1,2 +1,4 @@
 [kuksa-client]
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 authorization = "/etc/xdg/AGL/tbtnavi/tbtnavi.token"

diff --git a/recipes-demo/navigation/tbtnavi/tbtnavi.conf.gateway-demo b/recipes-demo/navigation/tbtnavi/tbtnavi.conf.gateway-demo
index 6f52871..9ee14f1 100644 (file)
--- a/recipes-demo/navigation/tbtnavi/tbtnavi.conf.gateway-demo
+++ b/recipes-demo/navigation/tbtnavi/tbtnavi.conf.gateway-demo
@@ -1,4 +1,6 @@
 [kuksa-client]
 hostname = "192.168.10.4"
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 tls-server-name = "localhost"
 authorization = "/etc/xdg/AGL/tbtnavi/tbtnavi.token"

diff --git a/recipes-demo/navigation/tbtnavi/tbtnavi.conf.kvm-demo b/recipes-demo/navigation/tbtnavi/tbtnavi.conf.kvm-demo
index 6e891fa..7fab2b1 100644 (file)
--- a/recipes-demo/navigation/tbtnavi/tbtnavi.conf.kvm-demo
+++ b/recipes-demo/navigation/tbtnavi/tbtnavi.conf.kvm-demo
@@ -1,4 +1,6 @@
 [kuksa-client]
 hostname = "172.16.10.1"
+use-tls = true
+ca-certificate = "/etc/kuksa-val/CA.pem"
 tls-server-name = "localhost"
 authorization = "/etc/xdg/AGL/tbtnavi/tbtnavi.token"