Rename "local-net" to default and fix healthcheck network

This commit is contained in:
Tobias Reisinger 2023-12-11 03:26:12 +01:00
parent c32e305eb3
commit 1d074bf14b
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
9 changed files with 10 additions and 29 deletions

View file

@ -6,12 +6,12 @@ compose_file_main:
labels: labels:
com.centurylinklabs.watchtower.enable: "{{ compose.watchtower | default(false) }}" com.centurylinklabs.watchtower.enable: "{{ compose.watchtower | default(false) }}"
networks: networks:
local-net: default:
apps: apps:
aliases: aliases:
- "{{ svc.name }}" - "{{ svc.name }}"
networks: networks:
local-net: default:
apps: apps:
external: true external: true

View file

@ -27,6 +27,6 @@ compose:
privileged: true privileged: true
command: "dockerd -H tcp://0.0.0.0:2375 --tls=false" command: "dockerd -H tcp://0.0.0.0:2375 --tls=false"
networks: networks:
local-net: default:
volumes: volumes:
data: data:

View file

@ -10,6 +10,7 @@ x-common-elements:
- service.env - service.env
volumes: volumes:
- ./data/:/opt - ./data/:/opt
network_mode: host
services: services:
http: http:
@ -21,8 +22,3 @@ services:
mail: mail:
<<: *common-elements <<: *common-elements
command: "/opt/mail" command: "/opt/mail"
networks:
default:
name: healthcheck
external: true

View file

@ -63,7 +63,7 @@ svc_yml:
compose: compose:
watchtower: false watchtower: false
image: influxdb:2 image: influxdb:2.7
volumes: volumes:
- ./influxdb.yml:/etc/influxdb2/config.yml - ./influxdb.yml:/etc/influxdb2/config.yml
- data:{{ svc.data_dir }} - data:{{ svc.data_dir }}

View file

@ -56,7 +56,7 @@ compose:
- nginx_config:/opt/recipes/nginx/conf.d - nginx_config:/opt/recipes/nginx/conf.d
- mediafiles:/opt/recipes/mediafiles - mediafiles:/opt/recipes/mediafiles
networks: networks:
local-net: default:
volumes: volumes:
nginx_config: nginx_config:
staticfiles: staticfiles:

View file

@ -37,7 +37,7 @@ compose:
volumes: volumes:
- app:/var/www/html - app:/var/www/html
networks: networks:
local-net: default:
updater: updater:
image: cthulhoo/ttrss-fpm-pgsql-static image: cthulhoo/ttrss-fpm-pgsql-static
@ -50,7 +50,7 @@ compose:
- tt-rss - tt-rss
command: /opt/tt-rss/updater.sh command: /opt/tt-rss/updater.sh
networks: networks:
local-net: default:
volumes: volumes:
app: app:

View file

@ -20,4 +20,4 @@ compose:
labels: labels:
com.centurylinklabs.watchtower.enable: true com.centurylinklabs.watchtower.enable: true
networks: networks:
local-net: default:

View file

@ -50,4 +50,4 @@ compose:
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
networks: networks:
local-net: default:

View file

@ -1,15 +0,0 @@
USER_AGENT="healthcheck-bot for serguzim.net"
HTTP_HC_UID=
MATRIX_SERVER="https://matrix.msrg.cc"
MATRIX_SERVER_FEDTESTER="msrg.cc"
MATRIX_HC_UID=
MATRIX_TOKEN=
MATRIX_ROOM=
MAIL_HC_UID=
MAIL_HOST=mail.serguzim.me
MAIL_PORT=587
MAIL_USER=healthcheck@serguzim.me
MAIL_PASS=