overleaf cleanup

docker-compose.yml

@@ -9,8 +9,6 @@ include:
       - ${DB_PATH}/adminer/adminer.yml
       - ${DB_PATH}/lldap/lldap.yml
       - ${DB_PATH}/mariadb/mariadb.yml
-      - ${DB_PATH}/mongodb/mongodb.yml
-      - ${DB_PATH}/mongo-express/mongo-express.yml
       - ${DB_PATH}/postgres/postgres.yml
       - ${DB_PATH}/pgadmin/pgadmin.yml
       - ${DB_PATH}/redis/redis.yml
@@ -41,9 +39,9 @@ include:
       - ${SERVICE_PATH}/gitea/gitea.yml
       - ${SERVICE_PATH}/it-tools/it-tools.yml
       - ${SERVICE_PATH}/mealie/mealie.yml
-      - ${SERVICE_PATH}/overleaf/overleaf.yml
       - ${SERVICE_PATH}/paperless-ngx/paperless-ngx.yml
       - ${SERVICE_PATH}/shlink/shlink.yml
+      - ${SERVICE_PATH}/sponsorblock/sponsorblock.yml
       - ${SERVICE_PATH}/stirling-pdf/stirling-pdf.yml
       - ${SERVICE_PATH}/vikunja/vikunja.yml
     env_file: ${SERVICE_PATH}/.env

project/db/mongo-express/mongo-express.yml

@@ -1,23 +0,0 @@
-services:
-  mongo-express:
-    extends:
-      file: ${TEMPLATES_PATH}
-      service: default
-    image: mongo-express
-    container_name: mongo-express
-    ports:
-      - 8086:8081
-    environment:
-      ME_CONFIG_BASICAUTH_USERNAME: ${MONGO_EXPRESS_USERNAME}
-      ME_CONFIG_BASICAUTH_PASSWORD: ${MONGO_EXPRESS_PASSWORD}
-      ME_CONFIG_MONGODB_ADMINUSERNAME: ${MONGO_EXPRESS_USERNAME}
-      ME_CONFIG_MONGODB_ADMINPASSWORD: ${MONGO_EXPRESS_PASSWORD}
-      ME_CONFIG_MONGODB_URL: mongodb://${MONGO_DB_USERNAME}:${MONGO_DB_ROOT_PASSWORD}@mongodb:27017/
-    labels:
-      # Watchtower
-      - "com.centurylinklabs.watchtower.enable=true"
-      # Traefik
-      - "traefik.enable=true"
-      - "traefik.http.routers.mongo-express.rule=Host(`mongo-express.${LOCAL_DOMAIN}`)"
-      - "traefik.http.routers.mongo-express.entrypoints=https"
-      - "traefik.http.routers.mongo-express.tls=true"

project/db/mongodb/mongodb.yml

@@ -1,18 +0,0 @@
-services:
-  mongodb:
-    extends:
-      file: ${TEMPLATES_PATH}
-      service: default
-    image: mongo:latest
-    container_name: mongodb
-    expose:
-      - 27017
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: ${MONGO_DB_USERNAME}
-      MONGO_INITDB_ROOT_PASSWORD: ${MONGO_DB_ROOT_PASSWORD}
-    volumes:
-      - ${DB_PATH}/mongodb/data:/data/db
-      - ${DB_PATH}/mongodb/init/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro
-    labels:
-      # Watchtower
-      - "com.centurylinklabs.watchtower.enable=true"

project/db/postgres/postgres.yml

@@ -29,7 +29,7 @@ services:
       file: ${TEMPLATES_PATH}
       service: default
     container_name: postgres-with-pg-vector
-    image: tensorchord/pgvecto-rs:pg16-v0.1.11
+    image: tensorchord/pgvecto-rs:pg16-v0.2.1-alpha.2
     ports:
       - 5433:5432
     secrets: [postgres_default_password]

project/infrastructure/syncthing/syncthing.yml

@@ -17,9 +17,8 @@ services:
       - "com.centurylinklabs.watchtower.enable=true"
       # Traefik
       - "traefik.enable=true"
-      - "traefik.http.routers.syncthing.rule=Host(`syncthing.${PUBLIC_DOMAIN}`)"
+      - "traefik.http.routers.syncthing.rule=Host(`syncthing.${LOCAL_DOMAIN}`)"
       - "traefik.http.routers.syncthing.entrypoints=https"
-      - "traefik.http.routers.syncthing.tls.certresolver=myresolver"
       - "traefik.http.routers.syncthing.tls=true"
       - "traefik.http.routers.syncthing.service=syncthing-svc"
       - "traefik.http.services.syncthing-svc.loadbalancer.server.port=8384"

project/service/overleaf/overleaf.yml

@@ -1,68 +0,0 @@
-services:
-  overleaf:
-    extends:
-      file: ${TEMPLATES_PATH}
-      service: default
-    image: sharelatex/sharelatex
-    container_name: overleaf
-    ports:
-      - 4008:80
-    volumes:
-      - ${SERVICE_PATH}/overleaf/config:/configs
-    environment:
-      OVERLEAF_APP_NAME: Overleaf on ${SECOND_LEVEL_DOMAIN}
-      OVERLEAF_NAV_TITLE: Overleaf
-      ENABLED_LINKED_FILE_TYPES: 'project_file,project_output_file'
-      # Enables Thumbnail generation using ImageMagick
-      ENABLE_CONVERSIONS: 'true'
-      # Disables email confirmation requirement
-      EMAIL_CONFIRMATION_DISABLED: 'true'
-      # temporary fix for LuaLaTex compiles, see https://github.com/overleaf/overleaf/issues/695
-      TEXMFVAR: /var/lib/overleaf/tmp/texmf-var
-      OVERLEAF_SITE_URL: https://overleaf.${LOCAL_DOMAIN}
-      # OVERLEAF_HEADER_IMAGE_URL: http://example.com/mylogo.png
-      OVERLEAF_ADMIN_EMAIL: ${EMAIL}
-      # OVERLEAF_LEFT_FOOTER: '[{"text": "Another page I want to link to can be found <a href=\"here\">here</a>"} ]'
-      # OVERLEAF_RIGHT_FOOTER: '[{"text": "Hello I am on the Right"} ]'
-      # OVERLEAF_EMAIL_FROM_ADDRESS: "hello@example.com"
-      # ENABLE_CRON_RESOURCE_DELETION: true
-      # OVERLEAF_TEMPLATES_USER_ID: "578773160210479700917ee5"
-      # OVERLEAF_NEW_PROJECT_TEMPLATE_LINKS: '[ {"name":"All Templates","url":"/templates/all"}]'
-      # OVERLEAF_PROXY_LEARN: "true"
-
-      # DB
-      OVERLEAF_MONGO_URL: mongodb://overleaf:${OVERLEAF_DB_PASSWORD}@mongodb:27017/overleaf
-      # Redis
-      OVERLEAF_REDIS_HOST: redis
-      REDIS_HOST: redis
-      # LDAP
-      LDAP_SERVER_URL: ldap://lldap:3890
-      OVERLEAF_LDAP_SEARCH_BASE: ou=people,dc=${SECOND_LEVEL_DOMAIN},dc=${TOP_LEVEL_DOMAIN}
-      OVERLEAF_LDAP_SEARCH_FILTER: '(uid={{username}})'
-      OVERLEAF_LDAP_BIND_DN: cn=readonly_user,ou=people,dc=${SECOND_LEVEL_DOMAIN},dc=${TOP_LEVEL_DOMAIN}
-      OVERLEAF_LDAP_BIND_CREDENTIALS: ${LLDAP_READONLY_USER_PASSWORD}
-      OVERLEAF_LDAP_EMAIL_ATT: mail
-      OVERLEAF_LDAP_NAME_ATT: firstName
-      OVERLEAF_LDAP_LAST_NAME_ATT: lastName
-      OVERLEAF_LDAP_UPDATE_USER_DETAILS_ON_LOGIN: false
-      ## SMTP
-      # OVERLEAF_EMAIL_SMTP_HOST: smtp.example.com
-      # OVERLEAF_EMAIL_SMTP_PORT: 587
-      # OVERLEAF_EMAIL_SMTP_SECURE: false
-      # OVERLEAF_EMAIL_SMTP_USER:
-      # OVERLEAF_EMAIL_SMTP_PASS:
-      # OVERLEAF_EMAIL_SMTP_TLS_REJECT_UNAUTH: true
-      # OVERLEAF_EMAIL_SMTP_IGNORE_TLS: false
-      # OVERLEAF_EMAIL_SMTP_NAME: '127.0.0.1'
-      # OVERLEAF_EMAIL_SMTP_LOGGER: true
-      # OVERLEAF_CUSTOM_EMAIL_FOOTER: "This system is run by department x"
-    labels:
-      # Watchtower
-      - "com.centurylinklabs.watchtower.enable=true"
-      # Traefik
-      - "traefik.enable=true"
-      - "traefik.http.routers.overleaf.rule=Host(`overleaf.${LOCAL_DOMAIN}`)"
-      - "traefik.http.routers.overleaf.entrypoints=https"
-      - "traefik.http.routers.overleaf.tls=true"
-      # Middlewares
-      - "traefik.http.routers.overleaf.middlewares=crowdsec-bouncer@file"

project/service/paperless-ngx/paperless-ngx.yml

@@ -10,8 +10,8 @@ services:
     volumes:
       - ${EXTERNAL_STORAGE}/paperless-ngx/data:/usr/src/paperless/data
       - ${EXTERNAL_STORAGE}/paperless-ngx/media:/usr/src/paperless/media
-      - ${SERVICE_PATH}/paperless-ngx/export:/usr/src/paperless/export
-      - ${SERVICE_PATH}/paperless-ngx/consume:/usr/src/paperless/consume
+      - ${SERVICE_PATH}/paperless-ngx/data/export:/usr/src/paperless/export
+      - ${SERVICE_PATH}/paperless-ngx/data/consume:/usr/src/paperless/consume
     environment:
       # REDIS
       PAPERLESS_REDIS: redis://redis:6379
@@ -24,10 +24,13 @@ services:
       PAPERLESS_URL: https://paperless.${LOCAL_DOMAIN}
       PAPERLESS_ALLOWED_HOSTS: ${LOCAL_DOMAIN}
       PAPERLESS_OCR_LANGUAGE: fra+eng+deu
-      # OIDC
-      PAPERLESS_ENABLE_HTTP_REMOTE_USER: true
-      PAPERLESS_ACCOUNT_ALLOW_SIGNUPS: false
-      PAPERLESS_LOGOUT_REDIRECT_URL: https://auth.${PUBLIC_DOMAIN}
+      # Admin user when not OIDC
+      PAPERLESS_ADMIN_USER: chris
+      PAPERLESS_ADMIN_PASSWORD: ${PAPERLESS_ADMIN_PASSWORD}
+      # # OIDC
+      # PAPERLESS_ENABLE_HTTP_REMOTE_USER: true
+      # PAPERLESS_ACCOUNT_ALLOW_SIGNUPS: false
+      # PAPERLESS_LOGOUT_REDIRECT_URL: https://auth.${PUBLIC_DOMAIN}
     labels:
       # Watchtower
       - "com.centurylinklabs.watchtower.enable=true"
@@ -36,5 +39,5 @@ services:
       - "traefik.http.routers.paperless.rule=Host(`paperless.${LOCAL_DOMAIN}`)"
       - "traefik.http.routers.paperless.entrypoints=https"
       - "traefik.http.routers.paperless.tls=true"
-      # Middlewares
-      - "traefik.http.routers.paperless.middlewares=authelia@file"
+      # # Middlewares
+      # - "traefik.http.routers.paperless.middlewares=authelia@file"

project/service/shlink/shlink.yml

@@ -11,7 +11,7 @@ services:
       - ${SERVICE_PATH}/shlink/data:/usr/share/tesseract-ocr/4.00/tessdata #Required for extra OCR languages
       - ${SERVICE_PATH}/shlink/config:/configs
     environment:
-      DEFAULT_DOMAIN: ${PUBLIC_DOMAIN}
+      DEFAULT_DOMAIN: shlink.${PUBLIC_DOMAIN}
       IS_HTTPS_ENABLED: true
       # GEOLITE_LICENSE_KEY: # optional, to geolocate visit, see https://shlink.io/documentation/geolite-license-key/
       # DB
@@ -24,9 +24,14 @@ services:
       - "com.centurylinklabs.watchtower.enable=true"
       # Traefik
       - "traefik.enable=true"
-      - "traefik.http.routers.shlink-backend.rule=Host(`shlink-backend.${LOCAL_DOMAIN}`)"
+      - "traefik.http.routers.shlink-backend.rule=Host(`shlink.${PUBLIC_DOMAIN}`)"
       - "traefik.http.routers.shlink-backend.entrypoints=https"
+      - "traefik.http.routers.shlink-backend.tls.certresolver=myresolver"
       - "traefik.http.routers.shlink-backend.tls=true"
+      - "traefik.http.routers.shlink-backend.service=shlink-backend-svc"
+      - "traefik.http.services.shlink-backend-svc.loadbalancer.server.port=8080"
+      # Middlewares
+      - "traefik.http.routers.shlink-backend.middlewares=crowdsec-bouncer@file"
 
   shlink-frontend:
     extends:
@@ -37,7 +42,7 @@ services:
     ports:
       - '4005:8080'
     environment:
-      SHLINK_SERVER_URL: https://shlink-backend.${LOCAL_DOMAIN}
+      SHLINK_SERVER_URL: https://shlink.${PUBLIC_DOMAIN}
       SHLINK_SERVER_API_KEY: ${SHLINK_SERVER_API_KEY}
     labels:
       # Watchtower

project/service/sponsorblock/sponsorblock.yml

@@ -0,0 +1,9 @@
+services:
+  sponsorblock:
+    extends:
+      file: ${TEMPLATES_PATH}
+      service: default
+    image: ghcr.io/dmunozv04/isponsorblocktv
+    container_name: sponsorblock
+    volumes:
+    - ${SERVICE_PATH}/sponsorblock/data:/app/data