From fa9c4c02014d1d3df9294507310619cdc51eb18e Mon Sep 17 00:00:00 2001 From: BhasherBEL Date: Tue, 26 Dec 2023 11:55:13 +0100 Subject: [PATCH] mdbook to wikijs --- bxl-shp/apps/docker-compose.wiki.yaml | 29 ++++++++++++------- .../config/idp/authelia.configuration.yaml | 14 +++++++++ bxl-shp/config/wiki/README.md | 1 - bxl-shp/config/wiki/SUMMARY.md | 9 ------ bxl-shp/config/wiki/user-guide/vaultwarden.md | 0 5 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 bxl-shp/config/wiki/README.md delete mode 100644 bxl-shp/config/wiki/SUMMARY.md delete mode 100644 bxl-shp/config/wiki/user-guide/vaultwarden.md diff --git a/bxl-shp/apps/docker-compose.wiki.yaml b/bxl-shp/apps/docker-compose.wiki.yaml index 41cb7a8..2dc21f7 100644 --- a/bxl-shp/apps/docker-compose.wiki.yaml +++ b/bxl-shp/apps/docker-compose.wiki.yaml @@ -1,18 +1,25 @@ services: - mdbook: - container_name: mdbook - image: thefarwind/mdbook + wikijs: + container_name: wikijs + image: ghcr.io/requarks/wiki:2 restart: unless-stopped - entrypoint: mdbook serve --hostname 0.0.0.0 + depends_on: + - postgres + environment: + - DB_TYPE=postgres + - DB_HOST=postgres + - DB_PORT=5432 + - DB_USER=postgres + - DB_PASS=${POSTGRES_PASSWORD} + - DB_NAME=wikijs labels: - "traefik.enable=true" - - "traefik.http.routers.mdbook.rule=Host(`wiki.bhasher.com`)" - - "traefik.http.routers.mdbook.entrypoints=internalsecure" - - "traefik.http.services.mdbook.loadbalancer.server.port=3000" - - "traefik.http.routers.mdbook.tls=true" - - "traefik.http.routers.mdbook.tls.certresolver=http" - volumes: - - $CONFIG/wiki:/src + - "traefik.http.routers.wikijs.rule=Host(`wiki.bhasher.com`)" + - "traefik.http.routers.wikijs.entrypoints=internalsecure" + - "traefik.http.services.wikijs.loadbalancer.server.port=3000" + - "traefik.http.routers.wikijs.tls=true" + - "traefik.http.routers.wikijs.tls.certresolver=http" networks: + - storage - external diff --git a/bxl-shp/config/idp/authelia.configuration.yaml b/bxl-shp/config/idp/authelia.configuration.yaml index 2d6b4a9..00dc73a 100644 --- a/bxl-shp/config/idp/authelia.configuration.yaml +++ b/bxl-shp/config/idp/authelia.configuration.yaml @@ -220,4 +220,18 @@ identity_providers: - profile - email userinfo_signing_algorithm: none + - id: wikijs + description: WikiJS + secret: '$argon2id$v=19$m=65536,t=3,p=4$aAnFAm2XL8rGMOLhMpgL1Q$ZBJ3v0d1guzLj/FVBTJz2v+ZAhy/jZc7B4iNozvx+hU' + public: false + authorization_policy: one_factor + redirect_uris: + - https://wiki.bhasher.com/login/4b20571d-a8d7-4384-a95c-589fe7fc7ab6/callback + consent_mode: implicit + scopes: + - openid + - profile + - email + - groups + userinfo_signing_algorithm: none diff --git a/bxl-shp/config/wiki/README.md b/bxl-shp/config/wiki/README.md deleted file mode 100644 index e10b99d..0000000 --- a/bxl-shp/config/wiki/README.md +++ /dev/null @@ -1 +0,0 @@ -# Introduction diff --git a/bxl-shp/config/wiki/SUMMARY.md b/bxl-shp/config/wiki/SUMMARY.md deleted file mode 100644 index 8e70570..0000000 --- a/bxl-shp/config/wiki/SUMMARY.md +++ /dev/null @@ -1,9 +0,0 @@ -# Summary - -[Introduction](README.md) - -# User Guide - -- [Vaultwarden](user-guide/vaultwarden.md) - - diff --git a/bxl-shp/config/wiki/user-guide/vaultwarden.md b/bxl-shp/config/wiki/user-guide/vaultwarden.md deleted file mode 100644 index e69de29..0000000