gitops/xmidt
1
0
Fork 0
mirror of https://github.com/outbackdingo/xmidt.git synced 2026-08-25 14:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update docker-compose service versions (#26)

Browse Source 
* update service versions

* put back themis default partnerID

* Update readme

* switch back to monitor mode
This commit is contained in:
Joel Unzain
2020-05-06 10:33:56 -07:00
committed by GitHub
parent 0b9c154061
commit 928c031620
9 changed files with 109 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/docker-compose/README.md
+1 -1
View File
@@ -144,7 +144,7 @@ Content-Length: 231
Read a single parameter:
```
curl -i -H "Authorization: Basic dXNlcjpwYXNz" "http://localhost:6100/api/v2/device/mac:112233445566/config?names=Device.DeviceInfo.X_CISCO_COM_BootloaderVersion"
curl -i -H "Authorization: Basic dXNlcjpwYXNz" "http://localhost:6100/api/v2/device/mac:112233445566/config?names=Device.DeviceInfo.X_CISCO_COM_BootloaderVersion" -H "X-Xmidt-Partner-ID: comcast,nbc,sky"
```
Results in:
deploy/docker-compose/deploy.sh
+4 -4
View File
@@ -16,12 +16,12 @@ docker build -t goaws:local .
popd
echo "Running services..."
CADUCEUS_VERSION=${CADUCEUS_VERSION:-0.2.1} \
TR1D1UM_VERSION=${TR1D1UM_VERSION:-0.1.5} \
CADUCEUS_VERSION=${CADUCEUS_VERSION:-0.2.7} \
TR1D1UM_VERSION=${TR1D1UM_VERSION:-0.5.0} \
SCYTALE_VERSION=${SCYTALE_VERSION:-0.1.5} \
PETASOS_VERSION=${PETASOS_VERSION:-0.1.4} \
TALARIA_VERSION=${TALARIA_VERSION:-0.1.3} \
THEMIS_VERSION=${THEMIS_VERSION:-0.4.0} \
TALARIA_VERSION=${TALARIA_VERSION:-0.5.1} \
THEMIS_VERSION=${THEMIS_VERSION:-0.4.3} \
SIMULATOR_VERSION=${SIMULATOR_VERSION:-local} \
docker-compose -f $ROOT_DIR/deploy/docker-compose/docker-compose.yml up -d $@
deploy/docker-compose/docFiles/caduceus.yaml
+1 -3
View File
@@ -18,7 +18,7 @@
log:
file: "stdout"
level: "DEBUG"
json: false
json: true
env: test
fqdn: caduceus
scheme: http
@@ -76,8 +76,6 @@
id: "caduceus"
name: "caduceus"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
address: "http://caduceus"
deploy/docker-compose/docFiles/scytale.yaml
+1 -3
View File
@@ -23,7 +23,7 @@
log:
file: "stdout"
level: "DEBUG"
json: false
json: true
fanout:
endpoints: [ "http://petasos:6400/api/v2/device/send" ]
@@ -52,8 +52,6 @@
id: "scytale"
name: "scytale"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
address: "http://scytale"
deploy/docker-compose/docFiles/talaria-0.yaml
+30 -14
View File
@@ -20,7 +20,7 @@
log:
file: "stdout"
level: "debug"
json: false
json: true
device:
manager:
@@ -31,6 +31,9 @@
pingPeriod: "45s"
idlePeriod: "135s"
requestTimeout: "15s"
rehasher:
services:
- talaria
outbound:
method: "POST"
eventEndpoints:
@@ -54,13 +57,27 @@
eventMap:
default: http://caduceus:6000/api/v3/notify
jwtValidators:
-
keys:
Factory:
uri: "http://themis:6500/keys/{keyId}"
purpose: 0
updateInterval: 604800000000000
jwtValidator:
keys:
Factory:
uri: "http://themis:6500/keys/{keyId}"
purpose: 0
updateInterval: 24h
deviceAccessCheck:
type: monitor
checks:
-
name: PartnerID
deviceCredentialPath: partner-id
op: contains
wrpCredentialPath: PartnerIDs
inversed: true
-
name: Trusted Device
deviceCredentialPath: trust
op: "gt"
inputValue: 999
service:
defaultScheme: http
@@ -75,22 +92,21 @@
-
service: "talaria"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
passingOnly: true
-
service: "caduceus"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
passingOnly: true
registrations:
-
id: "talaria-0"
name: "talaria"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
address: "http://talaria-0"
deploy/docker-compose/docFiles/talaria-1.yaml
+31 -14
View File
@@ -20,7 +20,7 @@
log:
file: "stdout"
level: "debug"
json: false
json: true
device:
manager:
@@ -31,6 +31,11 @@
pingPeriod: "45s"
idlePeriod: "135s"
requestTimeout: "15s"
rehasher:
services:
- talaria
outbound:
method: "POST"
eventEndpoints:
@@ -54,13 +59,27 @@
eventMap:
default: http://caduceus:6000/api/v3/notify
jwtValidators:
-
keys:
Factory:
uri: "http://themis:6500/keys/{keyId}"
purpose: 0
updateInterval: 604800000000000
jwtValidator:
keys:
Factory:
uri: "http://themis:6500/keys/{keyId}"
purpose: 0
updateInterval: 24h
deviceAccessCheck:
type: monitor
checks:
-
name: PartnerID
deviceCredentialPath: partner-id
op: contains
wrpCredentialPath: PartnerIDs
inversed: true
-
name: Trusted Device
deviceCredentialPath: trust
op: "gt"
inputValue: 999
service:
defaultScheme: http
@@ -75,22 +94,20 @@
-
service: "talaria"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
passingOnly: true
-
service: "caduceus"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
passingOnly: true
registrations:
-
id: "talaria-1"
name: "talaria"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
address: "http://talaria-1"
deploy/docker-compose/docFiles/talaria-2.yaml
+30 -13
View File
@@ -31,6 +31,11 @@
pingPeriod: "45s"
idlePeriod: "135s"
requestTimeout: "15s"
rehasher:
services:
- talaria
outbound:
method: "POST"
eventEndpoints:
@@ -54,13 +59,27 @@
eventMap:
default: http://caduceus:6000/api/v3/notify
jwtValidators:
-
keys:
Factory:
uri: "http://themis:6500/keys/{keyId}"
purpose: 0
updateInterval: 604800000000000
jwtValidator:
keys:
Factory:
uri: "http://themis:6500/keys/{keyId}"
purpose: 0
updateInterval: 24h
deviceAccessCheck:
type: monitor
checks:
-
name: PartnerID
deviceCredentialPath: partner-id
op: contains
wrpCredentialPath: PartnerIDs
inversed: true
-
name: Trusted Device
deviceCredentialPath: trust
op: "gt"
inputValue: 999
service:
defaultScheme: http
@@ -75,22 +94,20 @@
-
service: "talaria"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
passingOnly: true
-
service: "caduceus"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
passingOnly: true
registrations:
-
id: "talaria-2"
name: "talaria"
tags:
- "dev"
- "docker"
- "stage=dev"
- "flavor=docker"
address: "http://talaria-2"
deploy/docker-compose/docFiles/themis.yaml
+9 -2
View File
@@ -31,11 +31,18 @@
value: "themis"
trust:
value: 1000
partner-id:
value: "comcast"
capabilities:
value:
- xmidt:issuer:test:.*:all
sub:
value: client:supplied
partnerID:
claim: partner-id
header: X-Midt-Partner-ID
parameter: pid
default: comcast
key:
kid: local
type: rsa
deploy/docker-compose/docFiles/tr1d1um.yaml
+2 -1
View File
@@ -30,6 +30,7 @@
file: "stdout"
level: "INFO"
json: false
reducedLoggingResponseCodes: [200, 504]
webhooksEnabled: false
@@ -51,7 +52,7 @@
authHeader: ["dXNlcjpwYXNz"]
targetURL: http://scytale:6300
# WRPSource: "dns:tr1d1um.xmidt.comcast.net"
WRPSource: "dns:tr1d1um.example.net"
supportedServices:
- "config"
clientTimeout: "135s"