Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 22 additions & 27 deletions .env.template
Original file line number Diff line number Diff line change
@@ -1,44 +1,39 @@
# WEB UI
WEBUI_PORT=4200
# Common
MPS_COMMON_NAME=localhost
MPSPORT=4433

# Console
APP_ENCRYPTION_KEY=
LOG_LEVEL=info
HTTP_PORT=8181
Comment on lines +7 to +8

# Console Auth
AUTH_DISABLED=false
AUTH_ADMIN_USERNAME=standalone
AUTH_ADMIN_PASSWORD=
AUTH_JWT_KEY=
AUTH_JWT_EXPIRATION=24h

# RPS
RPS_WEBSOCKETTLS=true
RPSWEBPORT=8081
RPSWEBSOCKETPORT=8080
RPS_LOG_LEVEL=info
RPS_DELAY_TIMER=12
RPS_MQTT_ADDRESS=

# MPS
MPS_VAULT_ADDRESS=http://vault:8200
MPS_GENERATE_CERTS=true
MPS_COMMON_NAME=localhost
MPSPORT=4433
MPSWEBPORT=3000
MPS_DEBUG=true
MPS_WEB_ADMIN_USER=
MPS_WEB_ADMIN_PASSWORD=
MPS_HTTPS=true
MPS_TLS_OFFLOAD=false
MPS_LOG_LEVEL=info
MPS_JWT_EXPIRATION=1440
MPS_JWT_SECRET=
MPS_JWT_ISSUER=9EmRJTbIiIb4bIeSsmgcWIjrR6HyETqc
MPS_MQTT_ADDRESS=

# MPS ROUTER
# MPS Router
PORT=8003
MPSWEBPORT=8181

# POSTGRES
# Postgres
POSTGRES_USER=postgresadmin
POSTGRES_PASSWORD=

# VAULT
# Vault
SECRETS_PATH=secret/data/
VAULT_ADDRESS=http://vault:8200
VAULT_TOKEN=

# CONSUL
# Consul (disabled by default; RPS env vars still required)
CONSUL_ENABLED=false
CONSUL_HOST=consul
CONSUL_PORT=8500
CONSUL_HOST=
CONSUL_PORT=
57 changes: 0 additions & 57 deletions Jenkinsfile

This file was deleted.

12 changes: 0 additions & 12 deletions build.ps1

This file was deleted.

25 changes: 0 additions & 25 deletions data/initMPS.sql

This file was deleted.

16 changes: 2 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- .env
environment:
APP_COMMON_NAME: ${MPS_COMMON_NAME}
DB_URL: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/consoledb
DB_URL: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/rpsdb
SECRET_ADDR: http://vault:8200
SECRET_TOKEN: ${VAULT_TOKEN}
HTTP_PORT: "8181"
Expand Down Expand Up @@ -78,7 +78,7 @@ services:
networks:
- openamtnetwork
environment:
MPS_CONNECTION_STRING: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/consoledb?sslmode=disable
MPS_CONNECTION_STRING: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/rpsdb?sslmode=disable
PORT: ${PORT}
MPS_PORT: ${MPSWEBPORT}
healthcheck:
Expand Down Expand Up @@ -155,18 +155,6 @@ services:
- 443:8443
- 8001:8001

Comment on lines 155 to 157
mosquitto:
restart: always
image: eclipse-mosquitto
ports:
- 8883:8883
volumes:
- ./mosquitto.conf:/mosquitto/config/mosquitto.conf
networks:
- openamtnetwork
profiles:
- "mqtt"

volumes:
app-volume:
private-volume:
Expand Down
Loading
Loading