diff options
| author | Rudolf J Streif <rstreif@jaguarlandrover.com> | 2016-02-25 11:24:18 -0800 |
|---|---|---|
| committer | Rudolf J Streif <rstreif@jaguarlandrover.com> | 2016-02-25 11:24:18 -0800 |
| commit | 4abf4bc05cac7341e9c80b02dc67e180bb076813 (patch) | |
| tree | ef5ba51a058c37eb64b6c06454b7407b3426ebf5 | |
| parent | 2f7d12a5b7843228052e9b9ed3919733652a5f89 (diff) | |
| parent | c4145a753b76c7cc87fa40ce4c88c58a16cd1095 (diff) | |
| download | rvi_core-4abf4bc05cac7341e9c80b02dc67e180bb076813.tar.gz | |
Merge pull request #88 from magnusfeuer/develop
Config file fixes. Script update remains.
| -rw-r--r-- | debian_template/rvi.postinst | 2 | ||||
| -rw-r--r-- | priv/config/rvi_backend.config | 2 | ||||
| -rw-r--r-- | priv/config/rvi_sample.config | 2 | ||||
| -rw-r--r-- | priv/config/rvi_ubuntu.config | 2 | ||||
| -rw-r--r-- | priv/config/rvi_yocto.config | 3 | ||||
| -rw-r--r-- | ubuntu_template/rvi.postinst | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/debian_template/rvi.postinst b/debian_template/rvi.postinst index 10c11fe..e4bf50d 100644 --- a/debian_template/rvi.postinst +++ b/debian_template/rvi.postinst @@ -24,7 +24,7 @@ case "$1" in configure) # Set up our config - cat /proc/sys/kernel/random/uuid > /etc/rvi/device_id + echo "genivi.org/node/$(cat /proc/sys/kernel/random/uuid)" > /etc/rvi/device_id echo "RVI Device ID set to $(cat /etc/rvi/device_id) in /etc/rvi/device_id" #DEBHELPER# ;; diff --git a/priv/config/rvi_backend.config b/priv/config/rvi_backend.config index 4d8a576..8e5ec37 100644 --- a/priv/config/rvi_backend.config +++ b/priv/config/rvi_backend.config @@ -44,7 +44,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice). [ { node_address, IPPort(MyIP, MyPort+7) }, - { node_service_prefix, "jlr.com/backend"}, + { node_service_prefix, "genivi.org/backend"}, { routing_rules, [ diff --git a/priv/config/rvi_sample.config b/priv/config/rvi_sample.config index a178c2d..3f957ba 100644 --- a/priv/config/rvi_sample.config +++ b/priv/config/rvi_sample.config @@ -143,7 +143,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% 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/node/$rvi_uuid(default_id)/"}, %% Routing rules determine how to get a message targeting a specific diff --git a/priv/config/rvi_ubuntu.config b/priv/config/rvi_ubuntu.config index 65319db..401229b 100644 --- a/priv/config/rvi_ubuntu.config +++ b/priv/config/rvi_ubuntu.config @@ -143,7 +143,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% value unless all services add a system-wide unique name %% to it. %% - { node_service_prefix, "genivi.org/vin/$rvi_uuid(default_vin)/"}, + { node_service_prefix, "$rvi_file(/etc/rvi/device_id,genivi.org/node/default_id)/"}, %% Routing rules determine how to get a message targeting a specific diff --git a/priv/config/rvi_yocto.config b/priv/config/rvi_yocto.config index 76a1064..0649e3c 100644 --- a/priv/config/rvi_yocto.config +++ b/priv/config/rvi_yocto.config @@ -144,8 +144,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice). %% value unless all services add a system-wide unique name %% to it. %% - { node_service_prefix, "genivi.org/vin/$rvi_uuid(default_vin)/"}, - + { node_service_prefix, "$rvi_file(/etc/opt/rvi/device_id,genivi.org/node/default_id)/"}, %% Routing rules determine how to get a message targeting a specific %% service to its destination. diff --git a/ubuntu_template/rvi.postinst b/ubuntu_template/rvi.postinst index f6d5de5..d1e36e8 100644 --- a/ubuntu_template/rvi.postinst +++ b/ubuntu_template/rvi.postinst @@ -24,7 +24,7 @@ case "$1" in configure) # Set up our config for apache - cat /proc/sys/kernel/random/uuid > /etc/rvi/device_id + echo "genivi.org/node/$(cat /proc/sys/kernel/random/uuid)" > /etc/rvi/device_id echo "RVI Device ID set to $(cat /etc/rvi/device_id) in /etc/rvi/device_id" update-rc.d rvi defaults ;; |