mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

add new endpoints for app v2 #116

Merged
edenhaus merged 17 commits from ecovacs-home into master 2021-06-05 15:06:19 +02:00
Conversation 27 Commits 17 Files changed 21 +39 -10
1 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 607201faad - Show all commits

49
docs/Docker.md
View file

@ -55,9 +55,6 @@ version: "3.6"
networks: networks:
bumper: bumper:
internal: true internal: true
ipam:
config:
- subnet: 172.19.200.0/24
services: services:
nginx: nginx:
@ -83,7 +80,6 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
bumper: bumper:
ipv4_address: 172.19.200.10
environment: environment:
PUID: 1000 PUID: 1000
@ -102,6 +98,8 @@ services:
## Nginx configuration ## Nginx configuration
File stored under `./nginx/nginx.conf`
``` ```
error_log stderr; error_log stderr;
pid /var/run/nginx.pid; pid /var/run/nginx.pid;
@ -109,6 +107,7 @@ pid /var/run/nginx.pid;
events { } events { }
stream { stream {
resolver 127.0.0.11 ipv6=off; #docker dns server
map_hash_bucket_size 64; map_hash_bucket_size 64;
map $ssl_preread_server_name $internalport { map $ssl_preread_server_name $internalport {
@ -116,7 +115,7 @@ stream {
~^.*(mq).*\.eco(vacs|user)\.(net|com)$ 8883; ~^.*(mq).*\.eco(vacs|user)\.(net|com)$ 8883;
# the rest of eco(user|vacs) requests # the rest of eco(user|vacs) requests
~^.*\.eco(vacs|user)\.(net|com)$ 443; ~^.*eco(vacs|user)\.(net|com)$ 443;
# mapping default to MQTT as the bots are connecting directly to the ip without SNI # mapping default to MQTT as the bots are connecting directly to the ip without SNI
default 8883; default 8883;
@ -125,24 +124,54 @@ stream {
server { server {
listen 443; listen 443;
ssl_preread on; ssl_preread on;
# Ip must match the one configurated above in the docker-compose proxy_pass bumper:$internalport;
proxy_pass 172.19.200.10:$internalport;
} }
server { server {
listen 5223; listen 5223;
proxy_pass 172.19.200.10:5223; proxy_pass bumper:5223;
} }
server { server {
listen 8007; listen 8007;
proxy_pass 172.19.200.10:8007; proxy_pass bumper:8007;
} }
server { server {
listen 8883; listen 8883;
proxy_pass 172.19.200.10:8883; proxy_pass bumper:8883;
} }
} }
```
## File structure
When ure are using the docker-compose example, you will have a similar file structure as below
```
.
├── certs
│   ├── bumper.crt
│   ├── bumper.csr
│   ├── bumper.key
│   ├── ca.crt
│   ├── ca.csr
│   ├── ca.key
│   ├── ca.srl
│   ├── certconfig_bumper.txt
│   ├── certconfig_ca.txt
│   ├── commands.md
│   ├── create_bumper.sh
│   ├── create_ca.sh
│   ├── csrconfig_bumper.txt
│   └── csrconfig_ca.txt
├── config
│   ├── bumper.db
│   └── passwd
├── docker-compose.yml
└── nginx
└── nginx.conf
3 directories, 18 files
``` ```