Skip to content

Commit

Permalink
Merge pull request SimpleHomelab#75 from gzecchi/master
Browse files Browse the repository at this point in the history
Add Traefik Custom Error Pages + SMTP To Telegram
  • Loading branch information
SimpleHomelab authored Aug 18, 2020
2 parents 36d6351 + d656cf7 commit 649e4cf
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 2 deletions.
20 changes: 18 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,28 @@

## Planned:

- Add projectsend, embystat, nextcloud, nut-upsd, HealthChecks, FileRun, smtp-to-telegram, fail2ban, ofelia
- traefik custom error pages https://github.com/guillaumebriday/traefik-custom-error-pages
- Add projectsend, embystat, nextcloud, nut-upsd, HealthChecks, FileRun, fail2ban, ofelia
- improvements from https://github.com/jamescurtin/traefik-proxy
- implement secrets and remove variables from .env
- Replace Ouroboros (stopped development + requires POST permissions on Socket Proxy) with Watchtower

## August 17, 2020

- Moved some of the apps to Synology docker stack (dockerc-compose-t2-synology.yml) - Portainer, MariaDB, InfluxDB, Mosquitto MQTT Broker, Cloudflare DDNS, Redis. Add my NUC stack as a separate endpoint NAS Portainer.
- Implemented Tecnativa Socket Proxy - Traefik, Portainer, Glances, Dozzle, Ouroboros, Docker-GC, Cloudflare Companion
- Moved from Home Assistant Supervised to Home Assistant Core
- Fixed multihost CNAME creation in Cloudflare Companion
- Fully rolled out Docker secrets - Traefik, Authelia, Plex, Guacamole, OAuth, MariaDB, etc.. There are still some images that do not support secrets.
- Renamed docker-compose-synology-t2.yml to docker-compose-t2-synology.yml
- Obsoleted SmokePing
- Obsoleted HA-DockerMon
- Obsoleted UniFi Controller
- Obsoleted Postgres
- Updated Authelia configuration.yml.example
- Obsoleted ZoneMinder. Moved to MotionEye
- Added Traefik Custom Error Pages
- Added SMTP to Telegram

## July 22, 2020

- Implemented socket proxy - Traefik, Portainer, Dozzle, Glances, cf-Companion, Docker-GC, WatchTower. Exception: ha-dockermon.
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ We will try to keep this repo up-to-date. For now, here are the apps currently i
### FRONTENDS

- Traefik - Reverse Proxy
- Traefik Custom Error Pages
- OAuth - Forward Authentication (Google OAuth 2.0)
- Authelia - Private Forward Authentication (Default)
- Portainer - Container Management
Expand Down Expand Up @@ -134,6 +135,7 @@ We will try to keep this repo up-to-date. For now, here are the apps currently i
- Monitorr - Webfront to display the status of any webapp or service (OBSOLETE)
- Cloud Commander - Web File Manager (OBSOLETE)
- Cloud9 - Cloud IDE (OBSOLETE)
- SMTP To Telegram - Sends all incoming Email messages to Telegram

### MAINTENANCE

Expand Down
22 changes: 22 additions & 0 deletions docker-compose-t2-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,28 @@ services:
## Middlewares
- "traefik.http.routers.traefik-rtr.middlewares=chain-authelia@file"

# Traefik - Custom Error Pages
traefik-error-pages:
container_name: traefik-error-pages
image: guillaumebriday/traefik-custom-error-pages
restart: unless-stopped
networks:
- t2_proxy
labels:
- "traefik.enable=true"
# HTTP Routers
- "traefik.http.routers.traefik-error-pages-rtr.entrypoints=https"
- "traefik.http.routers.traefik-error-pages-rtr.rule=HostRegexp(`{host:.+}`)"
- "traefik.http.routers.traefik-error-pages-rtr.priority=1"
# Middlewares
- "traefik.http.routers.traefik-error-pages-rtr.middlewares=traefik-error-pages"
- "traefik.http.middlewares.traefik-error-pages.errors.service=traefik-error-pages-svc"
- "traefik.http.middlewares.traefik-error-pages.errors.status=401,403,404,429,500,502,503"
- "traefik.http.middlewares.traefik-error-pages.errors.query=/{status}.html"
# HTTP Services
- "traefik.http.routers.traefik-error-pages-rtr.service=traefik-error-pages-svc"
- "traefik.http.services.traefik-error-pages-svc.loadbalancer.server.port=80"

# Docker Socket Proxy - Security Enchanced Proxy for Docker Socket
socket-proxy:
container_name: socket-proxy
Expand Down
34 changes: 34 additions & 0 deletions docker-compose-t2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,28 @@ services:
## Middlewares
- "traefik.http.routers.traefik-rtr.middlewares=chain-authelia@file"

# Traefik - Custom Error Pages
traefik-error-pages:
container_name: traefik-error-pages
image: guillaumebriday/traefik-custom-error-pages
restart: unless-stopped
networks:
- t2_proxy
labels:
- "traefik.enable=true"
# HTTP Routers
- "traefik.http.routers.traefik-error-pages-rtr.entrypoints=https"
- "traefik.http.routers.traefik-error-pages-rtr.rule=HostRegexp(`{host:.+}`)"
- "traefik.http.routers.traefik-error-pages-rtr.priority=1"
# Middlewares
- "traefik.http.routers.traefik-error-pages-rtr.middlewares=traefik-error-pages"
- "traefik.http.middlewares.traefik-error-pages.errors.service=traefik-error-pages-svc"
- "traefik.http.middlewares.traefik-error-pages.errors.status=401,403,404,429,500,502,503"
- "traefik.http.middlewares.traefik-error-pages.errors.query=/{status}.html"
# HTTP Services
- "traefik.http.routers.traefik-error-pages-rtr.service=traefik-error-pages-svc"
- "traefik.http.services.traefik-error-pages-svc.loadbalancer.server.port=80"

# Docker Socket Proxy - Security Enchanced Proxy for Docker Socket
socket-proxy:
container_name: socket-proxy
Expand Down Expand Up @@ -1741,6 +1763,18 @@ services:
- "traefik.http.routers.vscode-rtr.service=vscode-svc"
- "traefik.http.services.vscode-svc.loadbalancer.server.port=8080"

smtp_to_telegram:
image: kostyaesmukov/smtp_to_telegram
container_name: smtp_to_telegram
restart: always
networks:
- default
environment:
TZ: ${TZ}
ST_TELEGRAM_CHAT_IDS: ${TGRAM_CHAT_ID}
ST_TELEGRAM_BOT_TOKEN: ${TGRAM_BOT_TOKEN}
ST_TELEGRAM_MESSAGE_TEMPLATE: "{subject}\\n{body}"

############################# MAINTENANCE

# Ouroboros - Automatic Docker Container Updates
Expand Down

0 comments on commit 649e4cf

Please sign in to comment.