Skip to content

Commit

Permalink
Sync Env Vars With Master
Browse files Browse the repository at this point in the history 
Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
  • Loading branch information
@rodneyosodo
rodneyosodo committed Jul 12, 2023
1 parent 2a0e660 commit 6fe986b
Show file tree
Hide file tree
Showing 23 changed files with 101 additions and 97 deletions.
3 changes: 2 additions & 1 deletion cmd/bootstrap/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
const (
svcName = "bootstrap"
envPrefix = "MF_BOOTSTRAP_"
envPrefixDB = "MF_BOOTSTRAP_DB_"
envPrefixES = "MF_BOOTSTRAP_ES_"
envPrefixHttp = "MF_BOOTSTRAP_HTTP_"
defDB = "bootstrap"
Expand Down Expand Up @@ -82,7 +83,7 @@ func main() {

// Create new postgres client
dbConfig := pgClient.Config{Name: defDB}
db, err := pgClient.SetupWithConfig(envPrefix, *bootstrapPg.Migration(), dbConfig)
db, err := pgClient.SetupWithConfig(envPrefixDB, *bootstrapPg.Migration(), dbConfig)
if err != nil {
logger.Fatal(err.Error())
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/certs/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
const (
svcName = "certs"
envPrefix = "MF_CERTS_"
envPrefixDB = "MF_CERTS_DB_"
envPrefixHttp = "MF_CERTS_HTTP_"
defDB = "certs"
defSvcHttpPort = "9019"
Expand Down Expand Up @@ -93,7 +94,7 @@ func main() {
}

dbConfig := pgClient.Config{Name: defDB}
db, err := pgClient.SetupWithConfig(envPrefix, *certsPg.Migration(), dbConfig)
db, err := pgClient.SetupWithConfig(envPrefixDB, *certsPg.Migration(), dbConfig)
if err != nil {
logger.Fatal(err.Error())
}
Expand Down
3 changes: 1 addition & 2 deletions cmd/coap/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const (
svcName = "coap_adapter"
envPrefix = "MF_COAP_ADAPTER_"
envPrefixHttp = "MF_COAP_ADAPTER_HTTP_"
envPrefixCoap = "MF_COAP_ADAPTER_COAP_"
defSvcHttpPort = "5683"
defSvcCoapPort = "5683"
)
Expand Down Expand Up @@ -109,7 +108,7 @@ func main() {
hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(instanceID), logger)

coapServerConfig := server.Config{Port: defSvcCoapPort}
if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixCoap, AltPrefix: envPrefix}); err != nil {
if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefix}); err != nil {
logger.Fatal(fmt.Sprintf("failed to load %s CoAP server configuration : %s", svcName, err))
}
cs := coapserver.New(ctx, cancel, svcName, coapServerConfig, api.MakeCoAPHandler(svc, logger), logger)
Expand Down
3 changes: 1 addition & 2 deletions cmd/http/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import (
const (
svcName = "http_adapter"
envPrefix = "MF_HTTP_ADAPTER_"
envPrefixHttp = "MF_HTTP_ADAPTER_HTTP_"
defSvcHttpPort = "80"
)

Expand Down Expand Up @@ -97,7 +96,7 @@ func main() {
svc := newService(pub, tc, logger, tracer)

httpServerConfig := server.Config{Port: defSvcHttpPort}
if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHttp, AltPrefix: envPrefix}); err != nil {
if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefix}); err != nil {
logger.Fatal(fmt.Sprintf("failed to load %s HTTP server configuration : %s", svcName, err))
}
hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, instanceID), logger)
Expand Down
4 changes: 2 additions & 2 deletions cmd/mongodb-reader/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ const (
)

type config struct {
LogLevel string `env:"MF_MONGO_READER_LOG_LEVEL" envDefault:"info"`
SendTelemetry bool `env:"MF_SEND_TELEMETRY" envDefault:"true"`
LogLevel string `env:"MF_MONGO_READER_LOG_LEVEL" envDefault:"info"`
SendTelemetry bool `env:"MF_SEND_TELEMETRY" envDefault:"true"`
InstanceID string `env:"MF_MONGO_READER_INSTANCE_ID" envDefault:""`
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/twins/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const (
svcName = "twins"
queue = "twins"
envPrefix = "MF_TWINS_"
envPrefixDB = "MF_TWINS_MONGO_"
envPrefixDB = "MF_TWINS_DB_"
envPrefixHttp = "MF_TWINS_HTTP_"
envPrefixCache = "MF_TWINS_CACHE_"
envPrefixES = "MF_TWINS_ES_"
Expand Down
69 changes: 37 additions & 32 deletions docker/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ MF_EMAIL_PASSWORD=2b0d302e775b1e
MF_EMAIL_FROM_ADDRESS=from@example.com
MF_EMAIL_FROM_NAME=Example
MF_EMAIL_TEMPLATE=smtp-notifier.tmpl
MF_EMAIL_INSTANCE_ID=

### Things
MF_THINGS_LOG_LEVEL=debug
Expand Down Expand Up @@ -115,18 +114,18 @@ MF_THINGS_DB_SSL_ROOT_CERT=
MF_THINGS_INSTANCE_ID=

#### Things Client Config
MF_THINGS_URL=http://mainflux-things:9000
MF_THINGS_AUTH_GRPC_URL=mainflux-things:7000
MF_THINGS_URL=http://things:9000
MF_THINGS_AUTH_GRPC_URL=things:7000
MF_THINGS_AUTH_GRPC_TIMEOUT=1s
MF_THINGS_AUTH_GRPC_CLIENT_TLS=
MF_THINGS_AUTH_GRPC_CA_CERTS=

### HTTP
MF_HTTP_ADAPTER_LOG_LEVEL=debug
MF_HTTP_ADAPTER_HTTP_HOST=http-adapter
MF_HTTP_ADAPTER_HTTP_PORT=8008
MF_HTTP_ADAPTER_HTTP_SERVER_CERT=
MF_HTTP_ADAPTER_HTTP_SERVER_KEY=
MF_HTTP_ADAPTER_HOST=http-adapter
MF_HTTP_ADAPTER_PORT=8008
MF_HTTP_ADAPTER_SERVER_CERT=
MF_HTTP_ADAPTER_SERVER_KEY=
MF_HTTP_ADAPTER_INSTANCE_ID=

### MQTT
Expand All @@ -152,10 +151,10 @@ MF_DOCKER_VERNEMQ_LOG__CONSOLE__LEVEL=error

### CoAP
MF_COAP_ADAPTER_LOG_LEVEL=debug
MF_COAP_ADAPTER_COAP_HOST=coap-adapter
MF_COAP_ADAPTER_COAP_PORT=5683
MF_COAP_ADAPTER_COAP_SERVER_CERT=
MF_COAP_ADAPTER_COAP_SERVER_KEY=
MF_COAP_ADAPTER_HOST=coap-adapter
MF_COAP_ADAPTER_PORT=5683
MF_COAP_ADAPTER_SERVER_CERT=
MF_COAP_ADAPTER_SERVER_KEY=
MF_COAP_ADAPTER_HTTP_HOST=coap-adapter
MF_COAP_ADAPTER_HTTP_PORT=5683
MF_COAP_ADAPTER_HTTP_SERVER_CERT=
Expand All @@ -168,6 +167,7 @@ MF_WS_ADAPTER_HTTP_HOST=ws-adapter
MF_WS_ADAPTER_HTTP_PORT=8186
MF_WS_ADAPTER_HTTP_SERVER_CERT=
MF_WS_ADAPTER_HTTP_SERVER_KEY=
MF_WS_ADAPTER_INSTANCE_ID=

## Addons Services
### Bootstrap
Expand All @@ -185,12 +185,12 @@ MF_BOOTSTRAP_DB_HOST=bootstrap-db
MF_BOOTSTRAP_DB_PORT=5432
MF_BOOTSTRAP_DB_USER=mainflux
MF_BOOTSTRAP_DB_PASS=mainflux
MF_BOOTSTRAP_DB=bootstrap
MF_BOOTSTRAP_DB_DB=bootstrap
MF_BOOTSTRAP_DB_SSL_MODE=disable
MF_BOOTSTRAP_INSTANCE_ID=
MF_BOOTSTRAP_DB_SSL_CERT=
MF_BOOTSTRAP_DB_SSL_KEY=
MF_BOOTSTRAP_DB_SSL_ROOT_CERT=
MF_BOOTSTRAP_INSTANCE_ID=

### Provision
MF_PROVISION_CONFIG_FILE=/configs/config.toml
Expand Down Expand Up @@ -221,6 +221,8 @@ MF_SDK_CERTS_URL=http://localhost
MF_CERTS_SIGN_CA_PATH=/etc/ssl/certs/ca.crt
MF_CERTS_SIGN_CA_KEY_PATH=/etc/ssl/certs/ca.key
MF_CERTS_VAULT_HOST=http://vault:8200
MF_VAULT_PKI_INT_PATH=pki_int
MF_VAULT_CA_ROLE_NAME=mainflux
MF_CERTS_HTTP_HOST=certs
MF_CERTS_HTTP_PORT=9019
MF_CERTS_HTTP_SERVER_CERT=
Expand All @@ -229,7 +231,7 @@ MF_CERTS_DB_HOST=certs-db
MF_CERTS_DB_PORT=5432
MF_CERTS_DB_USER=mainflux
MF_CERTS_DB_PASS=mainflux
MF_CERTS_DB=certs
MF_CERTS_DB_DB=certs
MF_CERTS_DB_SSL_MODE=
MF_CERTS_DB_SSL_CERT=
MF_CERTS_DB_SSL_KEY=
Expand Down Expand Up @@ -286,11 +288,11 @@ MF_OPCUA_ADAPTER_ROUTE_MAP_DB=0
MF_OPCUA_ADAPTER_INSTANCE_ID=

### Cassandra
MF_CASSANDRA_DB_PORT=9042
MF_CASSANDRA_DB_CLUSTER=mainflux-cassandra
MF_CASSANDRA_DB_KEYSPACE=mainflux
MF_CASSANDRA_DB_USER=mainflux
MF_CASSANDRA_DB_PASS=mainflux
MF_CASSANDRA_CLUSTER=mainflux-cassandra
MF_CASSANDRA_KEYSPACE=mainflux
MF_CASSANDRA_USER=mainflux
MF_CASSANDRA_PASS=mainflux
MF_CASSANDRA_PORT=9042

### Cassandra Writer
MF_CASSANDRA_WRITER_LOG_LEVEL=debug
Expand All @@ -299,15 +301,15 @@ MF_CASSANDRA_WRITER_HTTP_HOST=cassandra-writer
MF_CASSANDRA_WRITER_HTTP_PORT=9004
MF_CASSANDRA_WRITER_HTTP_SERVER_CERT=
MF_CASSANDRA_WRITER_HTTP_SERVER_KEY=
MF_CASSANDRA_WRITER_INSANCE_ID=
MF_CASSANDRA_WRITER_INSTANCE_ID=

### Cassandra Reader
MF_CASSANDRA_READER_LOG_LEVEL=debug
MF_CASSANDRA_READER_HTTP_HOST=cassandra-reader
MF_CASSANDRA_READER_HTTP_PORT=9003
MF_CASSANDRA_READER_HTTP_SERVER_CERT=
MF_CASSANDRA_READER_HTTP_SERVER_KEY=
MF_CASSANDRA_READER_INSANCE_ID=
MF_CASSANDRA_READER_INSTANCE_ID=

### InfluxDB
MF_INFLUXDB_PROTOCOL=http
Expand All @@ -323,6 +325,9 @@ MF_INFLUXDB_DBURL=
MF_INFLUXDB_USER_AGENT=InfluxDBClient
MF_INFLUXDB_TIMEOUT=1s
MF_INFLUXDB_INSECURE_SKIP_VERIFY=false
MF_INFLUXDB_INIT_MODE=setup
MF_INFLUXDB_ADMIN_URL=http://${MF_INFLUXDB_HOST}:${MF_INFLUXDB_PORT}
MF_INFLUXDB_HTTP_ENABLED=true

### InfluxDB Writer
MF_INFLUX_WRITER_LOG_LEVEL=debug
Expand All @@ -342,22 +347,22 @@ MF_INFLUX_READER_HTTP_SERVER_KEY=
MF_INFLUX_READER_INSTANCE_ID=

### MongoDB
MF_MONGO_HOST=mongodb
MF_MONGO_HOST=mainflux-mongodb
MF_MONGO_PORT=27017
MF_MONGO_DB=mainflux

### MongoDB Writer
MF_MONGO_WRITER_LOG_LEVEL=debug
MF_MONGO_WRITER_CONFIG_PATH=/config.toml
MF_MONGO_WRITER_HTTP_HOST=mongo-writer
MF_MONGO_WRITER_HTTP_HOST=mongodb-writer
MF_MONGO_WRITER_HTTP_PORT=9008
MF_MONGO_WRITER_HTTP_SERVER_CERT=
MF_MONGO_WRITER_HTTP_SERVER_KEY=
MF_MONGO_WRITER_INSTANCE_ID=

### MongoDB Reader
MF_MONGO_READER_LOG_LEVEL=debug
MF_MONGO_READER_HTTP_HOST=mongo-reader
MF_MONGO_READER_HTTP_HOST=mongodb-reader
MF_MONGO_READER_HTTP_PORT=9007
MF_MONGO_READER_HTTP_SERVER_CERT=
MF_MONGO_READER_HTTP_SERVER_KEY=
Expand Down Expand Up @@ -434,9 +439,9 @@ MF_TWINS_CACHE_DB=0
MF_THINGS_ES_URL=es-redis:${MF_REDIS_TCP_PORT}
MF_THINGS_ES_PASS=
MF_THINGS_ES_DB=0
MF_TWINS_MONGO_HOST=twins-db
MF_TWINS_MONGO_PORT=27018
MF_TWINS_MONGO_DB=mainflux-twins
MF_TWINS_DB_HOST=twins-db
MF_TWINS_DB_PORT=27018
MF_TWINS_DB_DB=twins
MF_TWINS_INSTANCE_ID=

### SMTP Notifier
Expand All @@ -451,27 +456,27 @@ MF_SMTP_NOTIFIER_DB_HOST=smtp-notifier-db
MF_SMTP_NOTIFIER_DB_PORT=5432
MF_SMTP_NOTIFIER_DB_USER=mainflux
MF_SMTP_NOTIFIER_DB_PASS=mainflux
MF_SMTP_NOTIFIER_DB=subscriptions
MF_SMTP_NOTIFIER_INSTANCE_ID=
MF_SMTP_NOTIFIER_DB_DB=subscriptions
MF_SMTP_NOTIFIER_DB_SSL_MODE=disable
MF_SMTP_NOTIFIER_DB_SSL_CERT=
MF_SMTP_NOTIFIER_DB_SSL_KEY=
MF_SMTP_NOTIFIER_DB_SSL_ROOT_CERT=
MF_SMTP_NOTIFIER_EMAIL_TEMPLATE=smtp-notifier.tmpl
MF_SMTP_NOTIFIER_INSTANCE_ID=

### SMPP Notifier
MF_SMPP_NOTIFIER_LOG_LEVEL=debug
MF_SMPP_NOTIFIER_FROM_ADDR=
MF_SMPP_NOTIFIER_CONFIG_PATH=/config.toml
MF_SMPP_NOTIFIER_HTTP_HOST=smpp-notifier-db
MF_SMPP_NOTIFIER_HTTP_HOST=smpp-notifier
MF_SMPP_NOTIFIER_HTTP_PORT=9014
MF_SMPP_NOTIFIER_HTTP_SERVER_CERT=
MF_SMPP_NOTIFIER_HTTP_SERVER_KEY=
MF_SMPP_NOTIFIER_DB_HOST=
MF_SMPP_NOTIFIER_DB_HOST=smpp-notifier-db
MF_SMPP_NOTIFIER_DB_PORT=5432
MF_SMPP_NOTIFIER_DB_USER=mainflux
MF_SMPP_NOTIFIER_DB_PASS=mainflux
MF_SMPP_NOTIFIER_DB=subscriptions
MF_SMPP_NOTIFIER_DB_DB=subscriptions
MF_SMPP_NOTIFIER_DB_SSL_MODE=disable
MF_SMPP_NOTIFIER_DB_SSL_CERT=
MF_SMPP_NOTIFIER_DB_SSL_KEY=
Expand Down
4 changes: 2 additions & 2 deletions docker/addons/bootstrap/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ services:
MF_BOOTSTRAP_DB_PORT: ${MF_BOOTSTRAP_DB_PORT}
MF_BOOTSTRAP_DB_USER: ${MF_BOOTSTRAP_DB_USER}
MF_BOOTSTRAP_DB_PASS: ${MF_BOOTSTRAP_DB_PASS}
MF_BOOTSTRAP_DB: ${MF_BOOTSTRAP_DB}
MF_BOOTSTRAP_DB_DB: ${MF_BOOTSTRAP_DB_DB}
MF_BOOTSTRAP_DB_SSL_MODE: ${MF_BOOTSTRAP_DB_SSL_MODE}
MF_BOOTSTRAP_DB_SSL_CERT: ${MF_BOOTSTRAP_DB_SSL_CERT}
MF_BOOTSTRAP_DB_SSL_KEY: ${MF_BOOTSTRAP_DB_SSL_KEY}
MF_BOOTSTRAP_DB_SSL_ROOT_CERT: ${MF_BOOTSTRAP_DB_SSL_ROOT_CERT}
MF_AUTH_GRPC_URL: ${MF_USERS_GRPC_URL}
MF_AUTH_GRPC_TIMMEOUT: ${MF_USERS_GRPC_TIMEOUT}
MF_AUTH_GRPC_CLIENT_TLS: ${MF_USERS_GRPC_CLIENT_TLS}
MF_AUTH_GRPC_CA_CERTS: ${MF_USERS_GRPC_CA_CERTS}
MF_AUTH_GRPC_CA_CERT: ${MF_USERS_GRPC_CA_CERT}
MF_THINGS_URL: ${MF_THINGS_URL}
MF_JAEGER_URL: ${MF_JAEGER_URL}
MF_SEND_TELEMETRY: ${MF_SEND_TELEMETRY}
Expand Down
12 changes: 6 additions & 6 deletions docker/addons/certs/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
environment:
POSTGRES_USER: ${MF_CERTS_DB_USER}
POSTGRES_PASSWORD: ${MF_CERTS_DB_PASS}
POSTGRES_DB: ${MF_CERTS_DB}
POSTGRES_DB: ${MF_CERTS_DB_DB}
networks:
- docker_mainflux-base-net
volumes:
Expand All @@ -46,6 +46,10 @@ services:
MF_CERTS_SIGN_CA_PATH: ${MF_CERTS_SIGN_CA_PATH}
MF_CERTS_SIGN_CA_KEY_PATH: ${MF_CERTS_SIGN_CA_KEY_PATH}
MF_CERTS_VAULT_HOST: ${MF_CERTS_VAULT_HOST}
MF_VAULT_PKI_INT_PATH: ${MF_VAULT_PKI_INT_PATH}
MF_VAULT_CA_ROLE_NAME: ${MF_VAULT_CA_ROLE_NAME}
MF_VAULT_PKI_PATH: ${MF_VAULT_PKI_PATH}
MF_VAULT_TOKEN: ${MF_VAULT_TOKEN}
MF_CERTS_HTTP_HOST: ${MF_CERTS_HTTP_HOST}
MF_CERTS_HTTP_PORT: ${MF_CERTS_HTTP_PORT}
MF_CERTS_HTTP_SERVER_CERT: ${MF_CERTS_HTTP_SERVER_CERT}
Expand All @@ -54,15 +58,11 @@ services:
MF_CERTS_DB_PORT: ${MF_CERTS_DB_PORT}
MF_CERTS_DB_PASS: ${MF_CERTS_DB_PASS}
MF_CERTS_DB_USER: ${MF_CERTS_DB_USER}
MF_CERTS_DB: ${MF_CERTS_DB}
MF_CERTS_DB_DB: ${MF_CERTS_DB_DB}
MF_CERTS_DB_SSL_MODE: ${MF_CERTS_DB_SSL_MODE}
MF_CERTS_DB_SSL_CERT: ${MF_CERTS_DB_SSL_CERT}
MF_CERTS_DB_SSL_KEY: ${MF_CERTS_DB_SSL_KEY}
MF_CERTS_DB_SSL_ROOT_CERT: ${MF_CERTS_DB_SSL_ROOT_CERT}
MF_VAULT_PKI_INT_PATH: ${MF_VAULT_PKI_INT_PATH}
MF_VAULT_CA_ROLE_NAME: ${MF_VAULT_CA_ROLE_NAME}
MF_VAULT_PKI_PATH: ${MF_VAULT_PKI_PATH}
MF_VAULT_TOKEN: ${MF_VAULT_TOKEN}
MF_AUTH_GRPC_URL: ${MF_USERS_GRPC_URL}
MF_AUTH_GRPC_TIMEOUT: ${MF_USERS_GRPC_TIMEOUT}
MF_AUTH_GRPC_CLIENT_TLS: ${MF_USERS_GRPC_CLIENT_TLS}
Expand Down
2 changes: 1 addition & 1 deletion docker/addons/influxdb-reader/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
container_name: mainflux-influxdb-reader
restart: on-failure
environment:
MF_INFLUX_READER_LOG_LEVEL: debug
MF_INFLUX_READER_LOG_LEVEL: ${MF_INFLUX_READER_LOG_LEVEL}
MF_INFLUX_READER_HTTP_HOST: ${MF_INFLUX_READER_HTTP_HOST}
MF_INFLUX_READER_HTTP_PORT: ${MF_INFLUX_READER_HTTP_PORT}
MF_INFLUX_READER_HTTP_SERVER_CERT: ${MF_INFLUX_READER_HTTP_SERVER_CERT}
Expand Down
2 changes: 1 addition & 1 deletion docker/addons/mongodb-reader/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ services:
MF_THINGS_AUTH_GRPC_CA_CERTS: ${MF_THINGS_AUTH_GRPC_CA_CERTS}
MF_AUTH_GRPC_URL: ${MF_USERS_GRPC_URL}
MF_AUTH_GRPC_TIMEOUT : ${MF_USERS_GRPC_TIMEOUT}
MF_MONGO_READER_INSTANCE_ID: ${MF_MONGO_READER_INSTANCE_ID}
MF_AUTH_GRPC_CLIENT_TLS: ${MF_USERS_GRPC_CLIENT_TLS}
MF_AUTH_GRPC_CA_CERT: ${MF_USERS_GRPC_CA_CERT}
MF_JAEGER_URL: ${MF_JAEGER_URL}
MF_SEND_TELEMETRY: ${MF_SEND_TELEMETRY}
MF_MONGO_READER_INSTANCE_ID: ${MF_MONGO_READER_INSTANCE_ID}
ports:
- ${MF_MONGO_READER_HTTP_PORT}:${MF_MONGO_READER_HTTP_PORT}
networks:
Expand Down
1 change: 0 additions & 1 deletion docker/addons/provision/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ services:
MF_PROVISION_BS_CONFIG_PROVISIONING: ${MF_PROVISION_BS_CONFIG_PROVISIONING}
MF_PROVISION_BS_AUTO_WHITELIST: ${MF_PROVISION_BS_AUTO_WHITELIST}
MF_PROVISION_BS_CONTENT: ${MF_PROVISION_BS_CONTENT}
MF_PROVISION_CERTS_RSA_BITS: ${MF_PROVISION_CERTS_RSA_BITS}
MF_PROVISION_CERTS_HOURS_VALID: ${MF_PROVISION_CERTS_HOURS_VALID}
MF_SEND_TELEMETRY: ${MF_SEND_TELEMETRY}
MF_PROVISION_INSTANCE_ID: ${MF_PROVISION_INSTANCE_ID}
Expand Down
4 changes: 2 additions & 2 deletions docker/addons/smpp-notifier/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
environment:
POSTGRES_USER: ${MF_SMPP_NOTIFIER_DB_USER}
POSTGRES_PASSWORD: ${MF_SMPP_NOTIFIER_DB_PASS}
POSTGRES_DB: ${MF_SMPP_NOTIFIER_DB}
POSTGRES_DB: ${MF_SMPP_NOTIFIER_DB_DB}
networks:
- docker_mainflux-base-net
volumes:
Expand All @@ -47,7 +47,7 @@ services:
MF_SMPP_NOTIFIER_DB_PORT: ${MF_SMPP_NOTIFIER_DB_PORT}
MF_SMPP_NOTIFIER_DB_USER: ${MF_SMPP_NOTIFIER_DB_USER}
MF_SMPP_NOTIFIER_DB_PASS: ${MF_SMPP_NOTIFIER_DB_PASS}
MF_SMPP_NOTIFIER_DB: ${MF_SMPP_NOTIFIER_DB}
MF_SMPP_NOTIFIER_DB_DB: ${MF_SMPP_NOTIFIER_DB_DB}
MF_SMPP_NOTIFIER_DB_SSL_MODE: ${MF_SMPP_NOTIFIER_DB_SSL_MODE}
MF_SMPP_NOTIFIER_DB_SSL_CERT: ${MF_SMPP_NOTIFIER_DB_SSL_CERT}
MF_SMPP_NOTIFIER_DB_SSL_KEY: ${MF_SMPP_NOTIFIER_DB_SSL_KEY}
Expand Down
Loading

0 comments on commit 6fe986b

Please sign in to comment.