Skip to content

Commit ed05d1e

Browse files
SimpleHomelabSimpleHomelab
committed
* Several updates 2024_01_30. See full commit log.
* Remove HTTPS redirect scheme middleware. Not used and redirects handled globally with CLI commands. * Changed entrypoint names from http/https to web/websecure to align with several online documentation. * Updated readme. * Changed basic auth secret from htpassd to basic_auth_credentials (just easier to understand)
1 parent 546bf74 commit ed05d1e

File tree

91 files changed

+484
-520
lines changed

Some content is hidden

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

91 files changed

+484
-520
lines changed

‎README.md

+81-76
Large diffs are not rendered by default.

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

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ http:
44
chain:
55
middlewares:
66
- middlewares-rate-limit
7-
- middlewares-https-redirectscheme
87
- middlewares-secure-headers
98
- middlewares-basic-auth
109
- middlewares-compress

‎appdata/traefik2/rules/ds918/chain-no-auth.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ http:
44
chain:
55
middlewares:
66
- middlewares-rate-limit
7-
- middlewares-https-redirectscheme
87
- middlewares-secure-headers
98
- middlewares-compress

‎appdata/traefik2/rules/ds918/chain-oauth-external.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ http:
44
chain:
55
middlewares:
66
- middlewares-rate-limit
7-
- middlewares-https-redirectscheme
87
- middlewares-secure-headers
98
- middlewares-oauth-external
109
- middlewares-compress

‎appdata/traefik2/rules/ds918/chain-oauth.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ http:
44
chain:
55
middlewares:
66
- middlewares-rate-limit
7-
- middlewares-https-redirectscheme
87
- middlewares-secure-headers
98
- middlewares-oauth
109
- middlewares-compress

‎appdata/traefik2/rules/ds918/middlewares-basic-auth.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ http:
44
basicAuth:
55
# users:
66
# - "user:$apsdfswWvC/6.$E3FtsfTntPC0wVJ7IUVtX1"
7-
usersFile: "/run/secrets/htpasswd" #be sure to mount the volume through docker-compose.yml
7+
usersFile: "/run/secrets/basic_auth_credentials"
88
realm: "Traefik 2 Basic Auth"

‎appdata/traefik2/rules/ds918/middlewares-https-redirectscheme.yml

-6
This file was deleted.

‎appdata/traefik2/rules/hs/app-adguard-home-authelia.yml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ http:
33
adguard-rtr:
44
rule: "Host(`ag.{{env "DOMAINNAME_HS"}}`)"
55
entryPoints:
6-
- https
6+
- websecure
77
middlewares:
88
- chain-authelia
99
service: adguard-svc

‎appdata/traefik2/rules/hs/app-adguard-home-oauth.yml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ http:
33
adguard-rtr:
44
rule: "Host(`ag.{{env "DOMAINNAME_HS"}}`)"
55
entryPoints:
6-
- https
6+
- websecure
77
middlewares:
88
- chain-oauth
99
service: adguard-svc

‎appdata/traefik2/rules/hs/app-haos-no-auth.yml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ http:
33
haos-rtr:
44
rule: "Host(`haos.{{env "DOMAINNAME_HS"}}`)"
55
entryPoints:
6-
- https
6+
- websecure
77
middlewares:
88
- chain-no-auth
99
service: haos-svc

‎appdata/traefik2/rules/hs/app-pihole-oauth.yml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ http:
33
pihole-rtr:
44
rule: "Host(`pihole.{{env "DOMAINNAME_HS"}}`)"
55
entryPoints:
6-
- https
6+
- websecure
77
middlewares:
88
- chain-oauth
99
- pihole-add-admin

‎appdata/traefik2/rules/hs/app-plex-no-auth.yml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ http:
33
splex-rtr:
44
rule: "Host(`splex.{{env "DOMAINNAME_HS"}}`)"
55
entryPoints:
6-
- https
6+
- websecure
77
middlewares:
88
- chain-oauth
99
service: splex-svc

‎appdata/traefik2/rules/hs/app-proxmox-ve-oauth.yml.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ http:
33
proxmox-rtr:
44
rule: "Host(`pve.{{env "DOMAINNAME_HS"}}`)"
55
entryPoints:
6-
- https
6+
- websecure
77
middlewares:
88
- chain-oauth
99
service: proxmox-svc

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ tcp:
22
routers:
33
synology-traefik-rtr:
44
entryPoints:
5-
- "https"
5+
- websecure
66
rule: "HostSNIRegexp(`{{env "DOMAINNAME_DS918"}}`, `{subdomain:[a-z]+}.{{env "DOMAINNAME_DS918"}}`)"
77
service: synology-traefik-svc
88
tls:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ http:
44
rule: "Host(`tautulli.{{env "DOMAINNAME_HS"}}`)"
55
priority: 99
66
entryPoints:
7-
- https
7+
- websecure
88
middlewares:
99
- chain-oauth
1010
service: tautulli-svc
@@ -13,7 +13,7 @@ http:
1313
rule: "Host(`tautulli.$DOMAINNAME_HS`) && (Headers(`X-Api-Key`, `$TAUTULLI_API_KEY`) || Query(`apikey`, `$TAUTULLI_API_KEY`))"
1414
priority: 100
1515
entryPoints:
16-
- https
16+
- websecure
1717
middlewares:
1818
- chain-no-auth
1919
service: tautulli-svc

‎appdata/traefik2/rules/hs/app-unifi-controller-authelia.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ http:
33
unifi-rtr:
44
rule: "Host(`unifi.{{env "DOMAINNAME_HS"}}`)"
55
entryPoints:
6-
- https
6+
- websecure
77
middlewares:
88
- chain-authelia
99
service: unifi-svc

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-authelia
1110
#- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-basic-auth
1110
#- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ http:
44
chain:
55
middlewares:
66
- middlewares-rate-limit
7-
- middlewares-https-redirectscheme
87
- middlewares-secure-headers
98
#- middlewares-compress

‎appdata/traefik2/rules/hs/chain-no-auth.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ http:
55
middlewares:
66
#- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
#- middlewares-compress

‎appdata/traefik2/rules/hs/chain-oauth-external.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-oauth-external
1110
#- middlewares-compress

‎appdata/traefik2/rules/hs/chain-oauth-no-crowdsec.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ http:
44
chain:
55
middlewares:
66
- middlewares-rate-limit
7-
- middlewares-https-redirectscheme
87
- middlewares-secure-headers
98
- middlewares-oauth
109
#- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
#- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-oauth
1110
- middlewares-compress

‎appdata/traefik2/rules/hs/middlewares-basic-auth.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ http:
44
basicAuth:
55
# users:
66
# - "user:$apsdfswWvC/6.$E3FtsfTntPC0wVJ7IUVtX1"
7-
usersFile: "/shared/.htpasswd" #be sure to mount the volume through docker-compose.yml
8-
realm: "Traefik 2 Basic Auth"
7+
usersFile: "/run/secrets/basic_auth_credentials"
8+
realm: "Traefik 2 Basic Auth"

‎appdata/traefik2/rules/hs/middlewares-https-redirectscheme.yml

-6
This file was deleted.

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers-wp
109
- middlewares-authelia
1110
- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-authelia
1110
- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-basic-auth
1110
- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers-wp
109
- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ http:
55
middlewares:
66
# - middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers-wp
109
- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ http:
55
middlewares:
66
# - middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ http:
44
chain:
55
middlewares:
66
- middlewares-rate-limit
7-
- middlewares-https-redirectscheme
87
- middlewares-secure-headers-wp
98
- middlewares-oauth
109
- middlewares-compress

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ http:
55
middlewares:
66
- middlewares-traefik-bouncer # leave this out if you are not using CrowdSec
77
- middlewares-rate-limit
8-
- middlewares-https-redirectscheme
98
- middlewares-secure-headers
109
- middlewares-oauth
1110
- middlewares-compress

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ http:
44
basicAuth:
55
# users:
66
# - "user:$apsdfswWvC/6.$E3FtsfTntPC0wVJ7IUVtX1"
7-
usersFile: "/run/secrets/htpasswd" #be sure to mount the volume through docker-compose.yml
7+
usersFile: "/run/secrets/basic_auth_credentials"
88
realm: "Traefik 2 Basic Auth"

‎appdata/traefik2/rules/ws/middlewares-https-redirectscheme.yml

-6
This file was deleted.

‎compose/archives/heimdall.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Heimdall - Application Dashboard
2+
heimdall:
3+
<<: *common-keys-core # See EXTENSION FIELDS at the top
4+
image: lscr.io/linuxserver/heimdall
5+
container_name: heimdall
6+
# ports:
7+
# - "$HEIMDALL_PORT:80" # 80 to 82 already taken by other services
8+
# - "444:443" # 443 used by Traefik/Nginx Proxy Manager. Disabled because we will put Heimdall behind proxy.
9+
volumes:
10+
- $DOCKERDIR/appdata/heimdall:/config
11+
environment:
12+
<<: *default-tz-puid-pgid
13+
labels:
14+
- "traefik.enable=true"
15+
## HTTP Routers
16+
- "traefik.http.routers.heimdall-rtr.entrypoints=https"
17+
- "traefik.http.routers.heimdall-rtr.rule=Host(`$DOMAINNAME_CLOUD_SERVER`,`www.$DOMAINNAME_CLOUD_SERVER`)"
18+
## Middlewares
19+
- "traefik.http.routers.heimdall-rtr.middlewares=chain-oauth@file"
20+
## HTTP Services
21+
- "traefik.http.routers.heimdall-rtr.service=heimdall-svc"
22+
- "traefik.http.services.heimdall-svc.loadbalancer.server.port=80"

‎compose/archives/homepage.yml

100644100755
+22-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
1-
# Heimdall - Application Dashboard
2-
heimdall:
3-
<<: *common-keys-core # See EXTENSION FIELDS at the top
4-
image: lscr.io/linuxserver/heimdall
5-
container_name: heimdall
1+
services:
2+
# Homepage - Application Dashboard
3+
homepage:
4+
image: ghcr.io/gethomepage/homepage:latest
5+
container_name: homepage
6+
security_opt:
7+
- no-new-privileges:true
8+
restart: unless-stopped
9+
profiles: ["apps", "all"]
10+
networks:
11+
- t2_proxy
12+
- socket_proxy
613
# ports:
7-
# - "$HEIMDALL_PORT:80" # 80 to 82 already taken by other services
8-
# - "444:443" # 443 used by Traefik/Nginx Proxy Manager. Disabled because we will put Heimdall behind proxy.
14+
# - "3000:3000"
915
volumes:
10-
- $DOCKERDIR/appdata/heimdall:/config
16+
- $DOCKERDIR/appdata/homepage:/app/config
1117
environment:
12-
<<: *default-tz-puid-pgid
18+
TZ: $TZ
19+
PUID: $PUID
20+
PGID: $PGID
1321
labels:
1422
- "traefik.enable=true"
1523
## HTTP Routers
16-
- "traefik.http.routers.heimdall-rtr.entrypoints=https"
17-
- "traefik.http.routers.heimdall-rtr.rule=Host(`$DOMAINNAME_CLOUD_SERVER`,`www.$DOMAINNAME_CLOUD_SERVER`)"
24+
- "traefik.http.routers.homepage-rtr.entrypoints=websecure"
25+
- "traefik.http.routers.homepage-rtr.rule=Host(`$DOMAINNAME_1`,`www.$DOMAINNAME_1`)" # Both domain.com and www.domain.com
1826
## Middlewares
19-
- "traefik.http.routers.heimdall-rtr.middlewares=chain-oauth@file"
27+
- "traefik.http.routers.homepage-rtr.middlewares=chain-no-auth@file"
2028
## HTTP Services
21-
- "traefik.http.routers.heimdall-rtr.service=heimdall-svc"
22-
- "traefik.http.services.heimdall-svc.loadbalancer.server.port=80"
29+
- "traefik.http.routers.homepage-rtr.service=homepage-svc"
30+
- "traefik.http.services.homepage-svc.loadbalancer.server.port=3000"

‎compose/ds918/glances.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
# privileged: true # Only for VM
1111
# network_mode: host
1212
networks:
13-
- t2_proxy
13+
- traefik_proxy
1414
- socket_proxy
1515
- default
1616
ports:
@@ -28,11 +28,11 @@ services:
2828
DOCKER_HOST: tcp://socket-proxy:2375
2929
labels:
3030
- "traefik.enable=true"
31-
## HTTP Routers
31+
# HTTP Routers
3232
- "traefik.http.routers.glances-rtr.entrypoints=https"
3333
- "traefik.http.routers.glances-rtr.rule=Host(`glances.$DOMAINNAME_DS918`)"
34-
## Middlewares
34+
# Middlewares
3535
- "traefik.http.routers.glances-rtr.middlewares=chain-oauth@file"
36-
## HTTP Services
36+
# HTTP Services
3737
- "traefik.http.routers.glances-rtr.service=glances-svc"
3838
- "traefik.http.services.glances-svc.loadbalancer.server.port=61208"

0 commit comments

Comments
 (0)