diff options
Diffstat (limited to 'priv/config/rvi_yocto.config')
-rw-r--r-- | priv/config/rvi_yocto.config | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/priv/config/rvi_yocto.config b/priv/config/rvi_yocto.config index 6e7863a..76a1064 100644 --- a/priv/config/rvi_yocto.config +++ b/priv/config/rvi_yocto.config @@ -1,14 +1,13 @@ %% -*- erlang -*- -%% Copyright (C) 2014, Jaguar Land Rover +%% Copyright (C) 2014,2015,2016 Jaguar Land Rover %% %% This program is licensed under the terms and conditions of the %% Mozilla Public License, version 2.0. The full text of the %% Mozilla Public License is at https://www.mozilla.org/MPL/2.0/ %% -%% Configuration file for the (in-vehicle) IVI used by the hvac_demo -%% -%% See ../hvac_demo/README.md for details on the demo. +%% Configuration file for RVI built and deployed with the +%% Yocto Project %% %% See ../CONFIGURE.md for a details on the configuration process %% itself. @@ -23,14 +22,14 @@ Env = fun(V, Def) -> Str -> Str end end. +IPPort = fun(IP, Port) -> + IP ++ ":" ++ integer_to_list(Port) + end. MyPort = Env("RVI_PORT", 9000). MyIP = Env("RVI_MYIP", "127.0.0.1"). -MyNodeAddr = Env("RVI_MY_NODE_ADDR", "0.0.0.0:0"). +MyNodeAddr = Env("RVI_MY_NODE_ADDR", IPPort(MyIP, MyPort)). BackendIP = Env("RVI_BACKEND", "38.129.64.31"). BackendPort = Env("RVI_BACKEND_PORT", 8807). -IPPort = fun(IP, Port) -> - IP ++ ":" ++ integer_to_list(Port) - end. LogLevel = Env("RVI_LOGLEVEL", notice). [ @@ -62,12 +61,12 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% replaces the token. %% %% Example: - %% { node_service_prefix, "jlr.com/vin/$rvi_file(/etc/vin,default_vin)"}, + %% { node_service_prefix, "genivi.org/vin/$rvi_file(/etc/vin,default_vin)"}, %% %% will be substituted with the first line from the file %% /etc/vin: %% - %% { node_service_prefix, "jlr.com/vin/2GKEG25HXP4093669"}, + %% { node_service_prefix, "genivi.org/vin/2GKEG25HXP4093669"}, %% %% If /etc/vin cannot be opened, the value default_vin %% will be used instead. @@ -79,12 +78,12 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% to replace the token. %% %% Example: - %% { node_service_prefix, "jlr.com/vin/$rvi_env(VIN,default_vin)"}, + %% { node_service_prefix, "genivi.org/vin/$rvi_env(VIN,default_vin)"}, %% %% will be substituted with the value of the $VIN environment %% variable: %% - %% { node_service_prefix, "jlr.com/vin/2GKEG25HXP4093669"}, + %% { node_service_prefix, "genivi.org/vin/2GKEG25HXP4093669"}, %% %% If VIN is not a defined environment variable, the value %% default_vin will be used instead. @@ -99,12 +98,12 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% world wide unique. %% %% Example: - %% { node_service_prefix, "jlr.com/vin/$uuid(default_vin)"}, + %% { node_service_prefix, "genivi.org/vin/$uuid(default_vin)"}, %% %% will be substituted with the value of the root disk UUID: %% %% { node_service_prefix, - %% "jlr.com/vin/afc0a6d8-0264-4f8a-bb3e-51ff8655b51c"}, + %% "genivi.org/vin/afc0a6d8-0264-4f8a-bb3e-51ff8655b51c"}, %% %% If the root UUID cannot be retrieved, the value default_vin %% will be used instead. @@ -112,12 +111,6 @@ LogLevel = Env("RVI_LOGLEVEL", notice). {rvi_core, [ - - {key_pair, {openssl_pem, "rvi_core/priv/sample_keys/insecure_device_bkey_priv.pem"}}, - {provisioning_key, "rvi_core/priv/sample_keys/insecure_root_key_pub.pem"}, - {authorize_jwt, "rvi_core/priv/sample_keys/insecure_device_key_pub_sign.jwt"}, - {cert_dir, "rvi_core/priv/sample_certs"}, - %% Specify the node address that data_link uses to listen to %% incoming traffic from other rvi nodes. %% @@ -143,15 +136,15 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% %% If a locally connected service registers itself as %% "hvac/fan_speed", and the node_service_prefix is - %% "jlr.com/vin/1234/", this node will announce the service - %% "jlr.com/vin/1234/hvac/fan_speed" as being available + %% "genivi.org/vin/1234/", this node will announce the service + %% "genivi.org/vin/1234/hvac/fan_speed" as being available %% to remotely connected rvi nodes. %% %% Two rvi nodes should never have the same node_service_prefix %% value unless all services add a system-wide unique name %% to it. %% - { node_service_prefix, "jlr.com/vin/$rvi_uuid(default_vin)/"}, + { node_service_prefix, "genivi.org/vin/$rvi_uuid(default_vin)/"}, %% Routing rules determine how to get a message targeting a specific @@ -174,10 +167,10 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% The service prefix with the longest match against the service targeted %% by the message will be used. %% - %% Example: Targeted service = jlr.com/backend/sota/get_updates + %% Example: Targeted service = genivi.org/backend/sota/get_updates %% - %% Prefix1: { "jlr.com/backend", [...]} - %% Prefix2: { "jlr.com/backend/sota", [...]} + %% Prefix1: { "genivi.org/backend", [...]} + %% Prefix2: { "genivi.org/backend/sota", [...]} %% %% Prefix2 will be used. %% @@ -196,7 +189,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice). ] }, - { "jlr.com/backend/", + { "genivi.org/backend/", %% Which protocol and data link pair to use when transmitting the message %% to the targeted service. If a pair reports a failure, the next pair is tried. [ @@ -207,7 +200,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice). }, %% Used to communicate with vehicles - { "jlr.com/vin/", + { "genivi.org/vin/", [ { proto_json_rpc, { dlink_tcp_rpc, [ broadcast, { interface, "wlan0" } ] } }, { proto_json_rpc, { server_3g, [ initiate_outbound ]} }, @@ -281,6 +274,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% communication in case the access method for %% service_edge_rpc is specified as json_rpc. { json_rpc_address, { MyIP, MyPort+1 } }, % {"127.0.0.1",8801} + { msgpack_rpc_address, { MyIP, MyPort + 21 } }, %% Websocket is used for websocket access, preferably %% through the rvi.js package available for Javascript |