Skip to content

Commit 2af73dc

Browse files
ryanmeltryanmelt
committed
v6.1.0
1 parent bb3d222 commit 2af73dc

File tree

7 files changed

+104
-3
lines changed

7 files changed

+104
-3
lines changed

‎.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Which TAG to deploy, latest or specific version, e.g. 5.4.2
2-
OPENC3_TAG=6.0.2
2+
OPENC3_TAG=latest
33
# Comment this variable to disable local mode (don't set it to 0)
44
OPENC3_LOCAL_MODE=1
55
# Comment this variable to disable installing the Demo (don't set it to 0)

‎compose.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ services:
114114
OPENC3_BUCKET_USERNAME: "${OPENC3_BUCKET_USERNAME}"
115115
OPENC3_BUCKET_PASSWORD: "${OPENC3_BUCKET_PASSWORD}"
116116
OPENC3_SERVICE_PASSWORD: "${OPENC3_SERVICE_PASSWORD}"
117+
ANYCABLE_REDIS_URL: "redis://${OPENC3_REDIS_USERNAME}:${OPENC3_REDIS_PASSWORD}@${OPENC3_REDIS_HOSTNAME}:${OPENC3_REDIS_PORT}"
117118
env_file:
118119
- ".env"
119120

@@ -147,6 +148,7 @@ services:
147148
OPENC3_SR_BUCKET_USERNAME: "${OPENC3_SR_BUCKET_USERNAME}"
148149
OPENC3_SR_BUCKET_PASSWORD: "${OPENC3_SR_BUCKET_PASSWORD}"
149150
OPENC3_SERVICE_PASSWORD: "${OPENC3_SERVICE_PASSWORD}"
151+
ANYCABLE_REDIS_URL: "redis://${OPENC3_REDIS_USERNAME}:${OPENC3_REDIS_PASSWORD}@${OPENC3_REDIS_HOSTNAME}:${OPENC3_REDIS_PORT}"
150152
env_file:
151153
- ".env"
152154

@@ -155,7 +157,8 @@ services:
155157
image: "${OPENC3_REGISTRY}/${OPENC3_NAMESPACE}/openc3-operator${OPENC3_IMAGE_SUFFIX}:${OPENC3_TAG}"
156158
restart: "unless-stopped"
157159
# ports:
158-
# - "127.0.0.1:7779:7779" # Open port for the demo router
160+
# - "127.0.0.1:7779:7779" # Open port for the demo router
161+
# - "127.0.0.1:8081:8081/udp" # Open a udp port
159162
depends_on:
160163
- "openc3-redis"
161164
- "openc3-redis-ephemeral"

‎openc3-redis/users.acl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
user healthcheck on nopass -@all +cluster|info +ping
22
user openc3 on #022bd57403439b2a3ec0c081cdd35d40a199bbd4ee6fc0e5113edd4fe1c10071 allkeys allchannels -@all +@read +@write +@pubsub +@connection +@transaction +info
3-
user scriptrunner on #e808c74e210256ee7cf3ec165271544167de776d526f7fa94243e5cdcc08b0c1 resetkeys resetchannels ~running-script* ~*script-locks ~*script-breakpoints ~*openc3_log_messages &_action_cable_internal &script-api:* -@all +@read +@write +@pubsub +@hash +@connection
3+
user scriptrunner on #e808c74e210256ee7cf3ec165271544167de776d526f7fa94243e5cdcc08b0c1 resetkeys resetchannels ~running-script* ~*script-locks ~*script-breakpoints ~*openc3_log_messages &__anycable__ &_action_cable_internal &script-api:* -@all +@read +@write +@pubsub +@hash +@connection
44
user admin on #749f09bade8aca755660eeb17792da880218d4fbdc4e25fbec279d7fe9f65d70 +@admin
55
user default off

‎openc3-traefik/traefik-allow-http.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ http:
3535
replacement: "$1.html"
3636
routers:
3737
# Note: Priorities control router check order with highest priority evaluated first
38+
# Route to the openc3 cmd/tlm api websockets
39+
api-cable-router:
40+
rule: PathPrefix(`/openc3-api/cable`)
41+
service: service-api-cable
42+
priority: 10
43+
# Route to the openc3 script api websockets
44+
script-cable-router:
45+
rule: PathPrefix(`/script-api/cable`)
46+
service: service-script-cable
47+
priority: 9
3848
# Route to the openc3 cmd/tlm api
3949
api-router:
4050
rule: PathPrefix(`/openc3-api`)
@@ -100,6 +110,18 @@ http:
100110
service: service-minio
101111
priority: 1
102112
services:
113+
# The OpenC3 cmd/tlm api cable service
114+
service-api-cable:
115+
loadBalancer:
116+
passHostHeader: false
117+
servers:
118+
- url: "http://openc3-cosmos-cmd-tlm-api:3901"
119+
# The OpenC3 script api cable service
120+
service-script-cable:
121+
loadBalancer:
122+
passHostHeader: false
123+
servers:
124+
- url: "http://openc3-cosmos-script-runner-api:3902"
103125
# The OpenC3 cmd/tlm api service
104126
service-api:
105127
loadBalancer:

‎openc3-traefik/traefik-letsencrypt.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,24 @@ http:
5252
replacement: "$1.html"
5353
routers:
5454
# Note: Priorities control router check order with highest priority evaluated first
55+
# Route to the openc3 cmd/tlm api websockets
56+
api-cable-router:
57+
rule: PathPrefix(`/openc3-api/cable`)
58+
service: service-api-cable
59+
priority: 10
60+
tls:
61+
certResolver: myresolver
62+
domains:
63+
- main: "mydomain.com"
64+
# Route to the openc3 script api websockets
65+
script-cable-router:
66+
rule: PathPrefix(`/script-api/cable`)
67+
service: service-script-cable
68+
priority: 9
69+
tls:
70+
certResolver: myresolver
71+
domains:
72+
- main: "mydomain.com"
5573
# Route to the openc3 cmd/tlm api
5674
api-router:
5775
rule: PathPrefix(`/openc3-api`)
@@ -149,6 +167,18 @@ http:
149167
domains:
150168
- main: "mydomain.com"
151169
services:
170+
# The OpenC3 cmd/tlm api cable service
171+
service-api-cable:
172+
loadBalancer:
173+
passHostHeader: false
174+
servers:
175+
- url: "http://openc3-cosmos-cmd-tlm-api:3901"
176+
# The OpenC3 script api cable service
177+
service-script-cable:
178+
loadBalancer:
179+
passHostHeader: false
180+
servers:
181+
- url: "http://openc3-cosmos-script-runner-api:3902"
152182
# The OpenC3 cmd/tlm api service
153183
service-api:
154184
loadBalancer:

‎openc3-traefik/traefik-ssl.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ http:
5252
replacement: "$1.html"
5353
routers:
5454
# Note: Priorities control router check order with highest priority evaluated first
55+
# Route to the openc3 cmd/tlm api websockets
56+
api-cable-router:
57+
rule: PathPrefix(`/openc3-api/cable`)
58+
service: service-api-cable
59+
priority: 10
60+
tls: {}
61+
# Route to the openc3 script api websockets
62+
script-cable-router:
63+
rule: PathPrefix(`/script-api/cable`)
64+
service: service-script-cable
65+
priority: 9
66+
tls: {}
5567
# Route to the openc3 cmd/tlm api
5668
api-router:
5769
rule: PathPrefix(`/openc3-api`)
@@ -125,6 +137,18 @@ http:
125137
priority: 1
126138
tls: {}
127139
services:
140+
# The OpenC3 cmd/tlm api cable service
141+
service-api-cable:
142+
loadBalancer:
143+
passHostHeader: false
144+
servers:
145+
- url: "http://openc3-cosmos-cmd-tlm-api:3901"
146+
# The OpenC3 script api cable service
147+
service-script-cable:
148+
loadBalancer:
149+
passHostHeader: false
150+
servers:
151+
- url: "http://openc3-cosmos-script-runner-api:3902"
128152
# The OpenC3 cmd/tlm api service
129153
service-api:
130154
loadBalancer:

‎openc3-traefik/traefik.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ http:
3535
replacement: "$1.html"
3636
routers:
3737
# Note: Priorities control router check order with highest priority evaluated first
38+
# Route to the openc3 cmd/tlm api websockets
39+
api-cable-router:
40+
rule: PathPrefix(`/openc3-api/cable`)
41+
service: service-api-cable
42+
priority: 10
43+
# Route to the openc3 script api websockets
44+
script-cable-router:
45+
rule: PathPrefix(`/script-api/cable`)
46+
service: service-script-cable
47+
priority: 9
3848
# Route to the openc3 cmd/tlm api
3949
api-router:
4050
rule: PathPrefix(`/openc3-api`)
@@ -100,6 +110,18 @@ http:
100110
service: service-minio
101111
priority: 1
102112
services:
113+
# The OpenC3 cmd/tlm api cable service
114+
service-api-cable:
115+
loadBalancer:
116+
passHostHeader: false
117+
servers:
118+
- url: "http://openc3-cosmos-cmd-tlm-api:3901"
119+
# The OpenC3 script api cable service
120+
service-script-cable:
121+
loadBalancer:
122+
passHostHeader: false
123+
servers:
124+
- url: "http://openc3-cosmos-script-runner-api:3902"
103125
# The OpenC3 cmd/tlm api service
104126
service-api:
105127
loadBalancer:

0 commit comments

Comments
 (0)