Misc changes

This commit is contained in:
Marko Korhonen 2021-04-19 20:19:14 +03:00
parent 5a218b3925
commit 0c07155261
2 changed files with 15 additions and 57 deletions

View File

@ -17,9 +17,10 @@ services:
volumes:
- /etc/localtime:/etc/localtime:ro
- /var/run/docker.sock:/var/run/docker.sock:ro
- /docker/traefik/traefik.yml:/traefik.yml:ro
- /docker/traefik/dashboard-users:/dashboard-users:ro
- /docker/traefik/acme.json:/acme.json
- /docker/træfik/træfik/traefik.yml:/traefik.yml:ro
- /docker/træfik/træfik/dashboard-users:/dashboard-users:ro
- /docker/træfik/træfik/acme.json:/acme.json
- /docker/træfik/træfik/log:/var/log
labels:
- 'traefik.enable=true'
@ -36,6 +37,17 @@ services:
- 'traefik.http.routers.dashboard.tls.certresolver=http'
- 'traefik.http.routers.dashboard.service=api@internal'
fail2ban:
image: crazymax/fail2ban:latest
container_name: fail2ban
restart: unless-stopped
network_mode: "host"
cap_add:
- NET_ADMIN
- NET_RAW
volumes:
- /docker/træfik/træfik/log:/var/log/træfik:ro
- /docker/træfik/fail2ban:/data
networks:
proxy:
external: true

View File

@ -1,54 +0,0 @@
version: "3.3"
services:
wordpress:
container_name: wordpress
image: wordpress:latest
environment:
- TZ=Europe/Helsinki
- WORDPRESS_DB_HOST=mariadb-wordpress:3306
- WORDPRESS_DB_USER=wordpress
- WORDPRESS_DB_PASSWORD=wordpress
- WORDPRESS_DB_NAME=wordpress
restart: unless-stopped
networks:
- proxy
- wordpress
volumes:
- /docker/wordpress/wordpress:/var/www/html
- /etc/localtime:/etc/localtime:ro
labels:
- "traefik.enable=true"
- "traefik.http.routers.wordpress-redirect.entrypoints=http"
- "traefik.http.routers.wordpress-redirect.rule=Host(`johanna.korhonen.cc`)"
- "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
- "traefik.http.routers.wordpress-redirect.middlewares=http2https"
- "traefik.http.routers.wordpress.entrypoints=https"
- "traefik.http.routers.wordpress.rule=Host(`johanna.korhonen.cc`)"
- "traefik.http.routers.wordpress.tls=true"
- "traefik.http.routers.wordpress.tls.certresolver=http"
- "traefik.http.routers.wordpress.service=wordpress"
- "traefik.docker.network=proxy"
- "traefik.http.services.wordpress.loadbalancer.server.port=80"
mariadb-wordpress:
image: mariadb
container_name: mariadb-wordpress
volumes:
- /docker/wordpress/mariadb:/var/lib/mysql
restart: always
networks:
- wordpress
environment:
- MYSQL_ROOT_PASSWORD=oT8Veu3Vre4ohj3E
- MYSQL_DATABASE=wordpress
- MYSQL_USER=wordpress
- MYSQL_PASSWORD=wordpress
networks:
proxy:
external: true
wordpress:
external: false