OrgGo
/
Mainflux.mainflux
mirror of https://github.com/mainflux/mainflux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NOISSUE - Fix default values for port and x509 provision (#1367) 

* remove owner id

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* fix default port and certs settings

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* small typo fix

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* refactor env vars

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>

* revert users

Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
This commit is contained in:
Mirko Teodorovic 2021-02-27 01:01:48 +01:00 committed by GitHub
parent 56d04cda64
commit 0432b2aa03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env
View File

@ -111,14 +111,13 @@ MF_PROVISION_HTTP_PORT=8190
MF_PROVISION_ENV_CLIENTS_TLS=false
MF_PROVISION_SERVER_CERT=
MF_PROVISION_SERVER_KEY=
MF_PROVISION_MQTT_URL=tcp://localhost
MF_PROVISION_USERS_LOCATION=http://localhost:8180
MF_PROVISION_USERS_LOCATION=http://users:8180
MF_PROVISION_THINGS_LOCATION=http://things:8182
MF_PROVISION_USER=
MF_PROVISION_PASS=
MF_PROVISION_API_KEY=
MF_PROVISION_CERTS_SVC_URL=http://certs:8204
MF_PROVISION_X509_PROVISIONING=true
MF_PROVISION_X509_PROVISIONING=false
MF_PROVISION_BS_SVC_URL=http://bootstrap:8202/things
MF_PROVISION_BS_SVC_WHITELIST_URL=http://bootstrap:8202/things/state
MF_PROVISION_BS_CONFIG_PROVISIONING=true

4
cmd/provision/main.go
View File

@ -27,8 +27,7 @@ const (
defServerKey = ""
defThingsLocation = "http://localhost"
defUsersLocation = "http://localhost"
defMQTTURL = "localhost:1883"
defHTTPPort = "8091"
defHTTPPort = "8190"
defMfUser = "test@example.com"
defMfPass = "test"
defMfAPIKey = ""
@ -48,7 +47,6 @@ const (
envTLS = "MF_PROVISION_ENV_CLIENTS_TLS"
envServerCert = "MF_PROVISION_SERVER_CERT"
envServerKey = "MF_PROVISION_SERVER_KEY"
envMQTTURL = "MF_PROVISION_MQTT_URL"
envUsersLocation = "MF_PROVISION_USERS_LOCATION"
envThingsLocation = "MF_PROVISION_THINGS_LOCATION"
envMfUser = "MF_PROVISION_USER"

2
docker/addons/provision/docker-compose.yml
View File

@ -25,11 +25,9 @@ services:
MF_PROVISION_LOG_LEVEL: ${MF_PROVISION_LOG_LEVEL}
MF_PROVISION_HTTP_PORT: ${MF_PROVISION_HTTP_PORT}
MF_PROVISION_CONFIG_FILE: ${MF_PROVISION_CONFIG_FILE}
MF_PROVISION_LOG_LEVEL: ${MF_PROVISION_LOG_LEVEL}
MF_PROVISION_ENV_CLIENTS_TLS: ${MF_PROVISION_ENV_CLIENTS_TLS}
MF_PROVISION_SERVER_CERT: ${MF_PROVISION_SERVER_CERT}
MF_PROVISION_SERVER_KEY: ${MF_PROVISION_SERVER_KEY}
MF_PROVISION_MQTT_URL: ${MF_PROVISION_MQTT_URL}
MF_PROVISION_USERS_LOCATION: ${MF_PROVISION_USERS_LOCATION}
MF_PROVISION_THINGS_LOCATION: ${MF_PROVISION_THINGS_LOCATION}
MF_PROVISION_USER: ${MF_PROVISION_USER}

27
provision/README.md
View File

@ -18,32 +18,25 @@ following table. Note that any unset variables will be replaced with their
default values.
| Variable | Description | Default |
| ----------------------------------- | ------------------------------------------------- | -------------------------------- |
| ----------------------------------- | ------------------------------------------------- | --------------------------------------|
| MF_PROVISION_LOG_LEVEL | Service log level | debug |
| MF_PROVISION_USER | User (email) for accessing Mainflux | user@example.com |
| MF_PROVISION_PASS | Mainflux password | user123 |
| MF_PROVISION_API_KEY | Mainflux authentication token | |
| MF_PROVISION_CONFIG_FILE | Provision config file | config.toml |
| MF_PROVISION_HTTP_PORT | Provision service listening port | 8091 |
| MF_PROVISION_HTTP_PORT | Provision service listening port | 8190 |
| MF_PROVISION_ENV_CLIENTS_TLS | Mainflux SDK TLS verification | false |
| MF_PROVISION_SERVER_CERT | Mainflux gRPC secure server cert | |
| MF_PROVISION_SERVER_KEY | Mainflux gRPC secure server key | |
| MF_PROVISION_SERVER_KEY | Mainflux gRPC secure server key | |
| MF_PROVISION_MQTT_URL | Mainflux MQTT adapter URL | http://localhost:1883 |
| MF_PROVISION_USERS_LOCATION | Users service URL | http://locahost |
| MF_PROVISION_THINGS_LOCATION | Things service URL | http://localhost |
| MF_PROVISION_LOG_LEVEL | Service log level | http://localhost |
| MF_PROVISION_HTTP_PORT | Service listening port | 8091 |
| MF_PROVISION_USER | Mainflux user username | test@example.com |
| MF_PROVISION_PASS | Mainflux user password | password |
| MF_PROVISION_BS_SVC_URL | Mainflux Bootstrap service URL | http://localhost/things/configs |
| MF_PROVISION_BS_SVC_WHITELIST_URL | Mainflux Bootstrap service whitelist URL | http://localhost/things/state |
| MF_PROVISION_CERTS_SVC_URL | Certificats service URL | http://localhost/certs |
| MF_PROVISION_USERS_LOCATION | Users service URL | http://users:8180 |
| MF_PROVISION_THINGS_LOCATION | Things service URL | http://things:8182 |
| MF_PROVISION_BS_SVC_URL | Mainflux Bootstrap service URL | http://bootstrap:8202/things |
| MF_PROVISION_BS_SVC_WHITELIST_URL | Mainflux Bootstrap service whitelist URL | http://bootstrap:8202/things/state |
| MF_PROVISION_CERTS_SVC_URL | Certificates service URL | http://certs:8204/certs |
| MF_PROVISION_X509_PROVISIONING | Should X509 client cert be provisioned | false |
| MF_PROVISION_BS_CONFIG_PROVISIONING | Should thing config be saved in Bootstrap service | true |
| MF_PROVISION_BS_AUTO_WHITELIST | Should thing be auto whitelisted | true |
| MF_PROVISION_BS_CONTENT | Bootstrap service configs content, JSON format | {} |
| MF_PROVISION_CERTS_CA | Mainflux CA cert for generating certificates | "" |
| MF_PROVISION_CERTS_CA_KEY | Mainflux CA cert private key | "" |
| MF_PROVISION_CERTS_RSA_BITS | Certificate RSA bits parameter | 4096 |
| MF_PROVISION_CERTS_HOURS_VALID | Number of days that certificate is valid | "2400h" |
@ -115,12 +108,12 @@ docker-compose -f docker/addons/provision/docker-compose.yml up
For the case that credentials or API token is passed in configuration file or environment variables, call to `/mapping` endpoint doesn't require `Authentication` header:
```bash
curl -s -S -X POST http://localhost:8888/mapping -H 'Content-Type: application/json' -d '{"external_id": "33:52:77:99:43", "external_key": "223334fw2"}'
curl -s -S -X POST http://localhost:<MF_PROVISION_HTTP_PORT>/mapping -H 'Content-Type: application/json' -d '{"external_id": "33:52:77:99:43", "external_key": "223334fw2"}'
```
In the case that provision service is not deployed with credentials or API key or you want to use user other than one being set in environment (or config file):
```bash
curl -s -S -X POST http://localhost:8091/mapping -H "Authorization: <token|api_key>" -H 'Content-Type: application/json' -d '{"external_id": "<external_id>", "external_key": "<external_key>"}'
curl -s -S -X POST http://localhost:<MF_PROVISION_HTTP_PORT>/mapping -H "Authorization: <token|api_key>" -H 'Content-Type: application/json' -d '{"external_id": "<external_id>", "external_key": "<external_key>"}'
```
Or if you want to specify a name for thing different than in `config.toml` you can specify post data as:

2
provision/config.go
View File

@ -26,7 +26,7 @@ type ServiceConf struct {
MfPass string `toml:"mf_pass"`
MfAPIKey string `toml:"mf_api_key"`
MfBSURL string `toml:"mf_bs_url"`
MfWhiteListURL string `toml:"mf_whit_list"`
MfWhiteListURL string `toml:"mf_white_list"`
MfCertsURL string `toml:"mf_certs_url"`
}

4
provision/configs/config.toml
View File

@ -10,13 +10,13 @@ file = "config.toml"
[server]
LogLevel = "info"
ca_certs = ""
http_port = "8091"
http_port = "8190"
mf_api_key = ""
mf_bs_url = "http://localhost:8202"
mf_certs_url = "http://localhost/certs"
mf_pass = ""
mf_user = ""
mf_whit_list = "http://localhost:8202/things/state"
mf_white_list = "http://localhost:8202/things/state"
mqtt_url = ""
port = ""
server_cert = ""