diff --git a/docker-compose.yml b/docker-compose.yml index dee4f9a..7c9d7e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,9 @@ services: - 8384:8384 - 22000:22000 - 21027:21027/udp + networks: + - frontend + - backend restart: unless-stopped milvert-nginx: @@ -56,7 +59,7 @@ services: - TZ=Europe/Stockholm gitea: - image: gitea/gitea:1.9.3 + image: gitea/gitea:1.12 container_name: gitea networks: - backend @@ -109,7 +112,9 @@ services: - PGID=1000 - TZ=Europe/Stockholm volumes: - - ./mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf + - ./mosquitto/mosquitto.conf:/mqtt/mosquitto.conf + - ${DIR}/mqtt/data:/mqtt/data + - ${DIR}/mqtt/log:/mqtt/log labels: - "traefik.http.routers.mqtt.rule=Host(`mqtt.${DOMAIN}`)" - "traefik.http.routers.mqtt.entrypoints=mqtt" diff --git a/mosquitto/mosquitto.conf b/mosquitto/mosquitto.conf index 374faa5..b983dd9 100644 --- a/mosquitto/mosquitto.conf +++ b/mosquitto/mosquitto.conf @@ -1,7 +1,18 @@ -persistence true -persistence_location /mosquitto/data/ -log_dest file /mosquitto/log/mosquitto.log +pid_file /var/run/mosquitto.pid +persistence true +persistence_location /mqtt/data/ + +user mosquitto + +# Port to use for the default listener. +port 1883 + + +log_dest file /mqtt/log/mosquitto.log +log_dest stdout + +include_dir /mqtt/config listener 1883 diff --git a/web/milvert.com/conf/milvert.com.conf b/web/milvert.com/conf/milvert.com.conf new file mode 100644 index 0000000..3487102 --- /dev/null +++ b/web/milvert.com/conf/milvert.com.conf @@ -0,0 +1,15 @@ +server { + + server_name milvert.com www.milvert.com; + + root /html; + + error_log /var/log/nginx/milvert.com.error.log; + access_log /var/log/nginx/milvert.com.access.log; + + listen 80 default_server; + listen [::]:80 default_server; + + + +} diff --git a/web/milvert.com/html/index.html b/web/milvert.com/html/index.html new file mode 100755 index 0000000..dc520ea --- /dev/null +++ b/web/milvert.com/html/index.html @@ -0,0 +1,47 @@ + +
+