Ruakij/Ansible-roles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.17.1

Browse Source 
This also sets up tls-termination for mosquitto
This commit is contained in:
Ruakij 2023-01-10 09:46:55 +01:00
parent 4ea9492ca3
commit 109a09052d
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netmaker_server/files/opt/netmaker_server/mosquitto/config/mosquitto.conf
View File

@ -1,11 +1,11 @@
per_listener_settings false per_listener_settings false
listener 8883 listener 8883
protocol websockets
allow_anonymous false allow_anonymous false
certfile /certs/node.crt
keyfile /certs/node.key
listener 1883 listener 1883
protocol websockets
allow_anonymous false allow_anonymous false
plugin /usr/lib/mosquitto_dynamic_security.so plugin /usr/lib/mosquitto_dynamic_security.so

5
netmaker_server/templates/docker-compose.yml.template
View File

@ -41,7 +41,7 @@ services:
# FIXME: /\ \/ Change http -> https # FIXME: /\ \/ Change http -> https
netmaker: # The Primary Server for running Netmaker netmaker: # The Primary Server for running Netmaker
image: gravitl/netmaker:v0.16.1 image: gravitl/netmaker:v0.17.1
depends_on: depends_on:
- rqlite - rqlite
cap_add: cap_add:
@ -104,7 +104,7 @@ services:
- "51821-51830:51821-51830/udp" # wireguard ports - "51821-51830:51821-51830/udp" # wireguard ports
netmaker-ui: # The Netmaker UI Component netmaker-ui: # The Netmaker UI Component
image: gravitl/netmaker-ui:v0.16.1 image: gravitl/netmaker-ui:v0.17.1
depends_on: depends_on:
- netmaker - netmaker
links: links:
@ -120,7 +120,6 @@ services:
- ./mosquitto/config:/mosquitto/config - ./mosquitto/config:/mosquitto/config
- ./mosquitto/data:/mosquitto/data - ./mosquitto/data:/mosquitto/data
- ./mosquitto/logs:/mosquitto/log - ./mosquitto/logs:/mosquitto/log
- "./certs:/certs:ro"
depends_on: depends_on:
- netmaker - netmaker
command: ["/mosquitto/config/wait.sh"] command: ["/mosquitto/config/wait.sh"]

2
netmaker_server/templates/nginx/passthrough.conf.template
View File

@ -6,7 +6,7 @@ stream{
{{ netmaker_ui.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443; {{ netmaker_ui.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
{{ netmaker_api.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443; {{ netmaker_api.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
{{ netmaker_broker.tls_host }}.{{ netmaker_base_domain }} mosquitto:8883; # todo: tls-terminate? {{ netmaker_broker.tls_host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
{{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} 127.0.0.1:8443; {{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} 127.0.0.1:8443;
{{ netmaker_rqlite.cluster_host }}.{{ ansible_facts.nodename }} rqlite:4002; {{ netmaker_rqlite.cluster_host }}.{{ ansible_facts.nodename }} rqlite:4002;

4
netmaker_server/templates/nginx/proxy.conf.template
View File

@ -3,7 +3,9 @@ map $host $proxy_name {
{{ netmaker_ui.host }}.{{ netmaker_base_domain }} netmaker-ui:80; {{ netmaker_ui.host }}.{{ netmaker_base_domain }} netmaker-ui:80;
{{ netmaker_api.host }}.{{ netmaker_base_domain }} netmaker:8081; {{ netmaker_api.host }}.{{ netmaker_base_domain }} netmaker:8081;
{{ netmaker_broker.tls_host }}.{{ netmaker_base_domain }} mosquitto:8883;
{{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} rqlite:4001; {{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} rqlite:4001;
default 444; default 444;