diff --git a/.env.example b/.env.example index 0df720b..600d478 100644 --- a/.env.example +++ b/.env.example @@ -26,3 +26,5 @@ NTFY_URL=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # dont forget NTFY_TOKEN=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx DOCKER_COMPOSE_DIR=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +BOOKLOGR_AUTH_SECRET_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/Caddyfile b/Caddyfile index 4831350..90bc182 100644 --- a/Caddyfile +++ b/Caddyfile @@ -50,7 +50,7 @@ videos.tomasrivera.ch { } books.tomasrivera.ch { - reverse_proxy jelu:11111 + reverse_proxy booklogr-web:5000 } convert.tomasrivera.ch { diff --git a/bootstrap.sh b/bootstrap.sh index fbf39fd..150af96 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -164,15 +164,13 @@ mkdir -p \ /opt/server/radicale/config \ /opt/server/radicale/data \ /opt/server/metube \ - /opt/server/jelu \ - /opt/server/jellyfin/config \ - /opt/server/jellyfin/cache \ /opt/server/transmute \ /opt/server/caddy/data \ /opt/server/caddy/config \ /opt/server/resspublica/feed \ /opt/server/resspublica/images \ - /opt/server/fav-archiver + /opt/server/fav-archiver \ + /opt/server/booklogr/api sudo chown -R 1000:1000 /opt/server/filebrowser # somehow filebrowser cant acces it diff --git a/compose.yml b/compose.yml index 19e294f..1535cc8 100644 --- a/compose.yml +++ b/compose.yml @@ -9,8 +9,8 @@ services: - flatnotes - radicale - metube - - jelu - jellyfin + - booklogr-web image: caddy:latest container_name: caddy restart: unless-stopped @@ -137,14 +137,6 @@ services: # MeTube application state - /opt/server/metube:/metube - jelu: - image: wabayang/jelu:latest - container_name: jelu - restart: unless-stopped - environment: - - TZ=Europe/Zurich - volumes: - - /opt/server/jelu:/data jellyfin: image: jellyfin/jellyfin:latest container_name: jellyfin @@ -170,7 +162,28 @@ services: volumes: - /opt/server/transmute:/app/data + booklogr-api: + container_name: "booklogr-api" + image: mozzo/booklogr:v1.11.1 + environment: + - DATABASE_URL=sqlite:///books.db + - AUTH_ALLOW_REGISTRATION=False + - AUTH_REQUIRE_VERIFICATION=False + - SINGLE_USER_MODE=True + AUTH_SECRET_KEY: "${BOOKLOGR_AUTH_SECRET_KEY}" + volumes: + - /opt/server/booklogr/api:/app/instance + booklogr-web: + container_name: "booklogr-web" + image: mozzo/booklogr-web:v1.11.1 + env_file: + - .env + environment: + - BL_API_ENDPOINT=http://localhost:5000/ # CHANGE THIS TO POINT TO THE EXTERNAL ADRESS THE USER CAN ACCESS + - BL_GOOGLE_ID= # Leave empty to disable google login. To enable, write in your Google Client ID. + - BL_DEMO_MODE=false + ports: environment: AUTH_SECRET_KEY: "${TRANSMUTE_SECRET_KEY}" AUTH_ACCESS_TOKEN_EXPIRE_MINUTES: 120