shmick/docker
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Latest updates after Silverblue; add WikiJS OpenID

Browse Source
This commit is contained in:
shmick
2022-05-14 18:00:02 +03:00
parent 185563ca05
commit 84d49a6672
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
authelia/configuration.yml
View File

@@ -137,8 +137,12 @@ identity_providers:
- id: wikijs - id: wikijs
description: WikiJS description: WikiJS
secret: 'mT#!fwRZ3$pE5g2rG4CCNKLkg4zg7&3L92e9LGemfYMbr92gPos&Js*4DU#&^*EUJ#PrP*y#W$W7^i2#zqJPhiK$3$z9uDNXYA$h9Urcuo8!Ggcq^#C6dow^s*VxV&WU' secret: 'mT#!fwRZ3$pE5g2rG4CCNKLkg4zg7&3L92e9LGemfYMbr92gPos&Js*4DU#&^*EUJ#PrP*y#W$W7^i2#zqJPhiK$3$z9uDNXYA$h9Urcuo8!Ggcq^#C6dow^s*VxV&WU'
public: false
authorization_policy: two_factor
audience: []
redirect_uris: redirect_uris:
- https://wiki.pukeko.xyz/login/2075d75c-0a5f-4949-bc42-2114036b97b3/callback - https://wiki.pukeko.xyz/login/a8755bfb-8a4e-49b7-b31b-43ac5638367a/callback
userinfo_signing_algorithm: none
scopes: scopes:
- openid - openid
- email - email
@@ -151,8 +155,6 @@ identity_providers:
- code - code
response_modes: response_modes:
- form_post - form_post
- query
- fragment
- id: grafana - id: grafana
description: Grafana description: Grafana
secret: '8Jx#U^%NXEvD#jc@A35wH!6PT8^DYo7pXftCKe3P%C%*xN9FQn26ec^kTxkuhA*9fZx@7*P65Y*L2Ty#Z*7n*f3#^$R!8TSuQ3THW*t#seL#iE7MatYEowb$GvU!8Y!5' secret: '8Jx#U^%NXEvD#jc@A35wH!6PT8^DYo7pXftCKe3P%C%*xN9FQn26ec^kTxkuhA*9fZx@7*P65Y*L2Ty#Z*7n*f3#^$R!8TSuQ3THW*t#seL#iE7MatYEowb$GvU!8Y!5'

19
docker-compose.yml
View File

@@ -5,6 +5,7 @@ services:
traefik: traefik:
image: "traefik:v2.6" image: "traefik:v2.6"
container_name: "traefik" container_name: "traefik"
privileged: true
command: command:
- "--log.level=DEBUG" - "--log.level=DEBUG"
- "--api.insecure=true" - "--api.insecure=true"
@@ -19,6 +20,10 @@ services:
- "--certificatesresolvers.pukekoresolver.acme.email=matanhorovitz@protonmail.com" - "--certificatesresolvers.pukekoresolver.acme.email=matanhorovitz@protonmail.com"
- "--certificatesresolvers.pukekoresolver.acme.storage=/letsencrypt/acme.json" - "--certificatesresolvers.pukekoresolver.acme.storage=/letsencrypt/acme.json"
- "--certificatesresolvers.pukekoresolver.acme.dnschallenge.resolvers=1.1.1.1:53" - "--certificatesresolvers.pukekoresolver.acme.dnschallenge.resolvers=1.1.1.1:53"
# Proxy to local Cockpit server
# - "--providers.file=true"
# - "--providers.file.directory=./config/cockpit.yml"
# - "--providers.file.watch=true"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -28,8 +33,8 @@ services:
- CF_API_EMAIL=matanhorovitz@protonmail.com - CF_API_EMAIL=matanhorovitz@protonmail.com
- CF_DNS_API_TOKEN=0dFNYA8qtzVhVtGi4nEb7_aclTOdGthYm5Q7N05n - CF_DNS_API_TOKEN=0dFNYA8qtzVhVtGi4nEb7_aclTOdGthYm5Q7N05n
volumes: volumes:
- "./letsencrypt:/letsencrypt" - "./letsencrypt:/letsencrypt:z"
- "/var/run/docker.sock:/var/run/docker.sock:ro" - "/var/run/docker.sock:/var/run/docker.sock:z"
networks: networks:
- network - network
- internal - internal
@@ -44,6 +49,7 @@ services:
- jekyll_network - jekyll_network
- jellyfin_network - jellyfin_network
- joplin_network - joplin_network
- paperless-ngx_network
- photoprism_network - photoprism_network
- podgrab_network - podgrab_network
- portainer_network - portainer_network
@@ -51,7 +57,6 @@ services:
- qbittorrent_network - qbittorrent_network
- syncthing_network - syncthing_network
- wikijs_network - wikijs_network
- wireguard_network
restart: unless-stopped restart: unless-stopped
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@@ -67,7 +72,7 @@ services:
image: b4bz/homer image: b4bz/homer
container_name: homer container_name: homer
volumes: volumes:
- ./homer/:/www/assets - ./homer/:/www/assets:z
ports: ports:
- 4957:8080 - 4957:8080
environment: environment:
@@ -90,7 +95,7 @@ services:
- TZ=Asia/Jerusalem - TZ=Asia/Jerusalem
- AUTHELIA_IDENTITY_PROVIDERS_OIDC_ISSUER_PRIVATE_KEY_FILE=/run/secrets/private_key - AUTHELIA_IDENTITY_PROVIDERS_OIDC_ISSUER_PRIVATE_KEY_FILE=/run/secrets/private_key
volumes: volumes:
- ./authelia:/config - ./authelia:/config:z
restart: unless-stopped restart: unless-stopped
secrets: secrets:
- hmac - hmac
@@ -140,6 +145,8 @@ networks:
external: true external: true
joplin_network: joplin_network:
external: true external: true
paperless-ngx_network:
external: true
photoprism_network: photoprism_network:
external: true external: true
podgrab_network: podgrab_network:
@@ -154,8 +161,6 @@ networks:
external: true external: true
wikijs_network: wikijs_network:
external: true external: true
wireguard_network:
external: true
qbittorrent_network: qbittorrent_network:
external: true external: true
syncthing_network: syncthing_network: