diff --git a/.env.example b/.env.example index 1f26d20..0df720b 100644 --- a/.env.example +++ b/.env.example @@ -26,7 +26,3 @@ NTFY_URL=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # dont forget NTFY_TOKEN=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx DOCKER_COMPOSE_DIR=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - -BOOKLOGR_AUTH_SECRET_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -BOOKLOGR_DEFAULT_USER=xxxxxxxxxxxxxxxxxxxxxxxxxx # needs to be an email -BOOKLOGR_DEFAULT_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/Caddyfile b/Caddyfile index f60ca99..af0b2b2 100644 --- a/Caddyfile +++ b/Caddyfile @@ -46,13 +46,6 @@ videos.tomasrivera.ch { reverse_proxy jellyfin:8096 } -books.tomasrivera.ch { - reverse_proxy booklogr-web:80 -} -books-api.tomasrivera.ch { - reverse_proxy booklogr-api:5000 -} - convert.tomasrivera.ch { reverse_proxy transmute:3313 } diff --git a/bootstrap.sh b/bootstrap.sh index 314c88b..3e09e1d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -169,8 +169,7 @@ mkdir -p \ /opt/server/caddy/config \ /opt/server/resspublica/feed \ /opt/server/resspublica/images \ - /opt/server/fav-archiver \ - /opt/server/booklogr/api + /opt/server/fav-archiver sudo chown -R tomasr:tomasr /opt/server/resspublica sudo chmod -R u+rwX /opt/server/resspublica diff --git a/compose.yml b/compose.yml index 1cca170..a93ed90 100644 --- a/compose.yml +++ b/compose.yml @@ -10,7 +10,6 @@ services: - radicale - metube - jellyfin - - booklogr-web image: caddy:latest container_name: caddy restart: unless-stopped @@ -165,41 +164,3 @@ services: environment: AUTH_SECRET_KEY: "${TRANSMUTE_SECRET_KEY}" AUTH_ACCESS_TOKEN_EXPIRE_MINUTES: 120 - booklogr-api: - container_name: "booklogr-api" - image: mozzo/booklogr:v1.11.1 - env_file: - - .env - environment: - BOOKLOGR_DEFAULT_PASSWORD: "${BOOKLOGR_DEFAULT_PASSWORD}" - BOOKLOGR_DEFAULT_USER: "${BOOKLOGR_DEFAULT_USER}" - DATABASE_URL: "sqlite:///books.db" - AUTH_ALLOW_REGISTRATION: False - AUTH_REQUIRE_VERIFICATION: False - SINGLE_USER_MODE: True - AUTH_SECRET_KEY: "${BOOKLOGR_AUTH_SECRET_KEY}" - BL_API_ENDPOINT: "http://books-api.tomasrivera.ch" # 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 - volumes: - - /opt/server/booklogr/api:/app/instance - - booklogr-web: - container_name: "booklogr-web" - image: mozzo/booklogr-web:v1.11.1 - env_file: - - .env - environment: - BOOKLOGR_DEFAULT_PASSWORD: "${BOOKLOGR_DEFAULT_PASSWORD}" - BOOKLOGR_DEFAULT_USER: "${BOOKLOGR_DEFAULT_USER}" - DATABASE_URL: "sqlite:///books.db" - AUTH_ALLOW_REGISTRATION: False - AUTH_REQUIRE_VERIFICATION: False - SINGLE_USER_MODE: True - AUTH_SECRET_KEY: "${BOOKLOGR_AUTH_SECRET_KEY}" - BL_API_ENDPOINT: "http://books-api.tomasrivera.ch" # 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 - - depends_on: - - booklogr-api diff --git a/web-server/index.html b/web-server/index.html index bea558e..b9811c5 100644 --- a/web-server/index.html +++ b/web-server/index.html @@ -82,11 +82,6 @@