Skip to content

Commit a78180b

Browse files
SimpleHomelabSimpleHomelab
committed
* Several updates 2024_05_01. See full commit log.
* Updated Traefik to v3 (on home server - hs). The rest will be migrated over slowly. * Syntax updated for Traefik v3 compatibility - Headers to Header, HeadersRegexp to HeaderRegexp, HostSNIRegexp, etc. Check https://www.smarthomebeginner.com/traefik-v3-docker-compose-guide-2024/#Migrating_from_Traefik_v2_to_v3. * "t2_proxy" network is now "t3_proxy" to represent Traefik v3. Subnet 192.168.90.0/24 remains the same. * Continuing to maintain both Traefik v2 and Traefik v3 appdata folders (at least for a few more months). * Removed compress middleware - was causing unnessary log warnings about mime type. I could not find a solution. * Removed Docker Compose version tags. * Added Authelia, Scrutiny, Kasm (WIP), and Firefly + Importer. * Bash Aliases updates. * Nginx verion update to 1.24 in web server (ws). * docker-compose-dns.yml is work-in-progress.
1 parent fec44e4 commit a78180b

File tree

95 files changed

+867
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+867
-179
lines changed

‎.gitignore‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,37 @@ appdata/traefik2/rules/ws/*
9595
!appdata/traefik2/rules/ws/middlewares-*.yml
9696
!appdata/traefik2/rules/ws/chain-*.yml
9797

98+
!appdata/traefik3
99+
appdata/traefik3/*
100+
!appdata/traefik3/*.example
101+
!appdata/traefik3/rules
102+
appdata/traefik3/rules/*
103+
!appdata/traefik3/rules/*.example
104+
!appdata/traefik3/rules/ws
105+
appdata/traefik3/rules/ws/*
106+
!appdata/traefik3/rules/ws/*.example
107+
!appdata/traefik3/rules/toml
108+
appdata/traefik3/rules/toml/*
109+
!appdata/traefik3/rules/toml/*.example
110+
!appdata/traefik3/rules/ds918
111+
appdata/traefik3/rules/ds918/*
112+
!appdata/traefik3/rules/ds918/*.example
113+
!appdata/traefik3/rules/ds918/tls-opts.yml
114+
!appdata/traefik3/rules/ds918/middlewares-*.yml
115+
!appdata/traefik3/rules/ds918/chain-*.yml
116+
!appdata/traefik3/rules/hs
117+
appdata/traefik3/rules/hs/*
118+
!appdata/traefik3/rules/hs/*.example
119+
!appdata/traefik3/rules/hs/tls-opts.yml
120+
!appdata/traefik3/rules/hs/middlewares-*.yml
121+
!appdata/traefik3/rules/hs/chain-*.yml
122+
!appdata/traefik3/rules/ws
123+
appdata/traefik3/rules/ws/*
124+
!appdata/traefik3/rules/ws/*.example
125+
!appdata/traefik3/rules/ws/tls-opts.yml
126+
!appdata/traefik3/rules/ws/middlewares-*.yml
127+
!appdata/traefik3/rules/ws/chain-*.yml
128+
98129
!appdata/authelia
99130
appdata/authelia/*
100131
!appdata/authelia/*.example

‎README.md‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,21 @@ This is the updated docker-compose repo of all the media, home, and web server a
77
### Ubuntu/Debian:
88

99
<ol>
10-
<li><a href="https://www.smarthomebeginner.com/ultimate-docker-server-1-os-preparation/">Ultimate Docker Server: Getting Started with OS Preparation</a> <span style="color:#50C878">[2024]</span></li>
10+
<li><a href="https://www.smarthomebeginner.com/ultimate-docker-server-1-os-preparation/">Ultimate Docker Server: Getting Started with OS Preparation</a> <span style="color:#6b5b95">[<a href="https://youtu.be/-ZSQdJ62r-Q" target="_blank" rel="noopener">VIDEO</a>]</span> <span style="color:#50C878">[2024]</span></li>
1111
<li><a href="https://www.smarthomebeginner.com/docker-media-server-2024/">Docker Media Server Ubuntu/Debian with 60+ Awesome Apps</a> <span style="color:#50C878">[2024]</span></li>
12+
<li>ZeroTier VPN Ubuntu, Docker, Synology, Windows: Secure on-the-go access <span style="color:#ffa400">[coming soon]</span></li>
1213
<li>Nginx Proxy Manager Docker Compose Guide: Simplest Reverse Proxy <span style="color:#ffa400">[coming soon]</span></li>
13-
<li><a href="https://www.smarthomebeginner.com/traefik-docker-compose-guide-2024/">Ultimate Traefik Docker Compose Guide: LE, SSL, Reverse Proxy</a> <span style="color:#50C878">[2024]</span></li>
14-
<li><a href="https://www.smarthomebeginner.com/docker-authelia-tutorial/">Authelia Docker Compose Guide: Secure 2-Factor Authentication</a> <span style="color:#ffa400">[2024 Update in Progress]</span></li>
15-
<li><a href="https://www.smarthomebeginner.com/traefik-forward-auth-google-oauth-2022/">Google OAuth Docker Compose Guide: Multi-Factor Authentication</a> <span style="color:#ffa400">[2024 Update in Progress]</span></li>
14+
<li>Traefik Reverse Proxy
15+
<ul>
16+
<li>Traefik v3: <a href="https://www.smarthomebeginner.com/traefik-v3-docker-compose-guide-2024/">Ultimate Traefik v3 Docker Compose Guide [2024]: LE, SSL, Reverse Proxy</a> <span style="color:#50C878">[2024]</span></li>
17+
<li>Traefik v2: <a href="https://www.smarthomebeginner.com/traefik-docker-compose-guide-2024/">Ultimate Traefik Docker Compose Guide: LE, SSL, Reverse Proxy</a> <span style="color:#50C878">[2024]</span></li>
18+
</ul>
19+
</li>
20+
<li><a href="https://www.smarthomebeginner.com/authelia-docker-compose-guide-2024/">Authelia Docker Compose Guide: Secure 2-Factor Authentication</a> <span style="color:#50C878">[2024]</span></li>
21+
<li><a href="https://www.smarthomebeginner.com/google-oauth-traefik-forward-auth-2024/">Google OAuth Docker Compose Guide: Multi-Factor Authentication</a> <span style="color:#50C878">[2024]</span></li>
1622
<li><a href="https://www.smarthomebeginner.com/traefik-docker-security-best-practices/">Docker Security Practices for Homelab: Secrets, Firewall, and more</a></li>
1723
<li><a href="https://www.smarthomebeginner.com/cloudflare-settings-for-traefik-docker/">Cloudflare Settings for Docker Traefik Stacks</a></li>
1824
<li>Implementing a Backup System for Docker Traefik Stack <span style="color:#ffa400">[coming soon]</span></li>
19-
<li><a href="https://www.smarthomebeginner.com/auto-traefik/">Automate the Whole Process with Auto-Traefik Script</a></li>
2025
</ol>
2126

2227
### Synology:

‎appdata/traefik2/rules/hs/app-tautulli-with-auth-bypass.yml.example‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ http:
99
- chain-oauth
1010
service: tautulli-svc
1111
tautulli-rtr-bypass:
12-
# rule: "Host(`tautulli.$DOMAINNAME_HS`) && Headers(`traefik-auth-bypass-key`, `$TRAEFIK_AUTH_BYPASS_KEY`)" # Bypass Auth for LunaSea on iOS
13-
rule: "Host(`tautulli.$DOMAINNAME_HS`) && (Headers(`X-Api-Key`, `$TAUTULLI_API_KEY`) || Query(`apikey`, `$TAUTULLI_API_KEY`))"
12+
# rule: "Host(`tautulli.$DOMAINNAME_HS`) && Header(`traefik-auth-bypass-key`, `$TRAEFIK_AUTH_BYPASS_KEY`)" # Bypass Auth for LunaSea on iOS
13+
rule: "Host(`tautulli.$DOMAINNAME_HS`) && (Header(`X-Api-Key`, `$TAUTULLI_API_KEY`) || Query(`apikey`, `$TAUTULLI_API_KEY`))"
1414
priority: 100
1515
entryPoints:
1616
- websecure

‎appdata/traefik2/rules/hs/chain-authelia.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ http:
33
chain-authelia:
44
chain:
55
middlewares:
6-
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
6+
# - middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
88
- middlewares-secure-headers
9-
- middlewares-authelia
10-
#- middlewares-compress
9+
- middlewares-authelia

‎appdata/traefik2/rules/hs/app-second-domain-passthrough.yml.example‎ renamed to ‎appdata/traefik2/rules/hs/domain-passthrough.yml.example‎

File renamed without changes.

‎appdata/traefik2/rules/ws/chain-authelia-wp.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ http:
77
- middlewares-rate-limit
88
- middlewares-secure-headers-wp
99
- middlewares-authelia
10-
- middlewares-compress

‎appdata/traefik2/rules/ws/chain-authelia.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ http:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
88
- middlewares-secure-headers
9-
- middlewares-authelia
10-
- middlewares-compress
9+
- middlewares-authelia

‎appdata/traefik2/rules/ws/chain-basic-auth.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ http:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
88
- middlewares-secure-headers
9-
- middlewares-basic-auth
10-
- middlewares-compress
9+
- middlewares-basic-auth

‎appdata/traefik2/rules/ws/chain-no-auth-crowdsec-wp.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-secure-headers-wp
9-
- middlewares-compress
8+
- middlewares-secure-headers-wp

‎appdata/traefik2/rules/ws/chain-no-auth-wp.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ http:
66
# - middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
88
- middlewares-secure-headers-wp
9-
- middlewares-compress

0 commit comments

Comments
 (0)