diff --git a/bentopdf/docker-compose.yml b/bentopdf/docker-compose.yml new file mode 100644 index 0000000..9a02409 --- /dev/null +++ b/bentopdf/docker-compose.yml @@ -0,0 +1,8 @@ +name: bentopdf +services: + app: + image: bentopdf/bentopdf:latest + container_name: bentopdf + ports: + - "9830:8080" + restart: unless-stopped diff --git a/gateway/authelia/config/configuration.yml b/gateway/authelia/config/configuration.yml index 3fdc16a..ec12315 100644 --- a/gateway/authelia/config/configuration.yml +++ b/gateway/authelia/config/configuration.yml @@ -84,7 +84,6 @@ identity_providers: allowed_origins: - "https://immich.64815139.xyz" - "https://gitea.64815139.xyz" - - "https://stirling-pdf.64815139.xyz" allowed_origins_from_client_redirect_uris: false clients: - client_id: T0kYrFHTASAXGCV-rUOlQLDGsW0HFJRx_eAQ1dx9mo-vTgilubJMU46Ud1oRexmtZBjgAsEp @@ -134,20 +133,3 @@ identity_providers: - form_post - query - fragment - - client_id: 'GXbZWCII_iRwoQAjtpP6WzXDKagzYZC~dRSq3QMgJyb3RrvcPG0n.Elm3NnEpq8LLh_uZktw' - client_name: 'Stirling-PDF' - client_secret: {{ secret "/run/secrets/STIRLING_PDF_CLIENT_SECRET" }} - public: false - authorization_policy: 'two_factor' - token_endpoint_auth_method: 'client_secret_basic' - scopes: - - 'openid' - - 'profile' - - 'groups' - - 'email' - redirect_uris: - - 'https://stirling-pdf.64815139.xyz/login/oauth2/code/oidc' - grant_types: - - 'authorization_code' - response_types: - - 'code' diff --git a/gateway/caddy/Caddyfile b/gateway/caddy/Caddyfile index cdc455c..2c8c5bf 100644 --- a/gateway/caddy/Caddyfile +++ b/gateway/caddy/Caddyfile @@ -65,7 +65,7 @@ immich.64815139.xyz { } } -stirling-pdf.64815139.xyz { +bento-pdf.64815139.xyz { route { reverse_proxy 192.168.0.216:3328 } diff --git a/gateway/cloudflare-ddns/config.json b/gateway/cloudflare-ddns/config.json index ed8a9b6..fe8088e 100644 --- a/gateway/cloudflare-ddns/config.json +++ b/gateway/cloudflare-ddns/config.json @@ -31,7 +31,7 @@ "proxied": false }, { - "name": "stirling-pdf", + "name": "bento-pdf", "proxied": false }, { diff --git a/gateway/dashboard/assets/icons/bento-pdf.svg b/gateway/dashboard/assets/icons/bento-pdf.svg new file mode 100644 index 0000000..74f705f --- /dev/null +++ b/gateway/dashboard/assets/icons/bento-pdf.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/gateway/dashboard/assets/icons/stirling-pdf.svg b/gateway/dashboard/assets/icons/stirling-pdf.svg deleted file mode 100644 index c62bd8e..0000000 --- a/gateway/dashboard/assets/icons/stirling-pdf.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gateway/dashboard/index.html b/gateway/dashboard/index.html index 03d703a..cf16fa7 100644 --- a/gateway/dashboard/index.html +++ b/gateway/dashboard/index.html @@ -37,11 +37,11 @@
  • - +
    - Stirling PDF + Bento PDF
    - Stirling PDF + Bento PDF
  • diff --git a/gateway/docker-compose.yml b/gateway/docker-compose.yml index f8303fa..817839d 100644 --- a/gateway/docker-compose.yml +++ b/gateway/docker-compose.yml @@ -1,36 +1,34 @@ name: gateway secrets: JWT_SECRET: - file: './authelia/secrets/auth/JWT_SECRET' + file: "./authelia/secrets/auth/JWT_SECRET" SESSION_SECRET: - file: './authelia/secrets/auth/SESSION_SECRET' + file: "./authelia/secrets/auth/SESSION_SECRET" STORAGE_ENCRYPTION_KEY: - file: './authelia/secrets/auth/STORAGE_ENCRYPTION_KEY' + file: "./authelia/secrets/auth/STORAGE_ENCRYPTION_KEY" SMTP_USERNAME: - file: './authelia/secrets/auth/SMTP_USERNAME' + file: "./authelia/secrets/auth/SMTP_USERNAME" SMTP_PASSWORD: - file: './authelia/secrets/auth/SMTP_PASSWORD' + file: "./authelia/secrets/auth/SMTP_PASSWORD" HMAC_SECRET: - file: './authelia/secrets/auth/HMAC_SECRET' + file: "./authelia/secrets/auth/HMAC_SECRET" POSTGRES_PASSWORD: - file: './authelia/secrets/postgres/POSTGRES_PASSWORD' + file: "./authelia/secrets/postgres/POSTGRES_PASSWORD" REDIS_PASSWORD: - file: './authelia/secrets/redis/REDIS_PASSWORD' + file: "./authelia/secrets/redis/REDIS_PASSWORD" OIDC_JWKS_AUTHELIA_PEM: - file: './authelia/secrets/jwks/rs256.pem' + file: "./authelia/secrets/jwks/rs256.pem" OIDC_JWKS_AUTHELIA_CERT: - file: './authelia/secrets/jwks/rs256.cert' + file: "./authelia/secrets/jwks/rs256.cert" IMMICH_CLIENT_SECRET: - file: './authelia/secrets/clients/IMMICH_CLIENT_SECRET' + file: "./authelia/secrets/clients/IMMICH_CLIENT_SECRET" GITEA_CLIENT_SECRET: - file: './authelia/secrets/clients/GITEA_CLIENT_SECRET' - STIRLING_PDF_CLIENT_SECRET: - file: './authelia/secrets/clients/STIRLING_PDF_CLIENT_SECRET' + file: "./authelia/secrets/clients/GITEA_CLIENT_SECRET" services: authelia: - image: 'docker.io/authelia/authelia:latest' + image: "docker.io/authelia/authelia:latest" container_name: gateway_authelia - restart: 'unless-stopped' + restart: "unless-stopped" expose: - 9091 depends_on: @@ -49,7 +47,6 @@ services: - OIDC_JWKS_AUTHELIA_CERT - IMMICH_CLIENT_SECRET - GITEA_CLIENT_SECRET - - STIRLING_PDF_CLIENT_SECRET environment: AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE: /run/secrets/JWT_SECRET AUTHELIA_SESSION_SECRET_FILE: /run/secrets/SESSION_SECRET @@ -104,7 +101,7 @@ services: container_name: gateway_cloudflare_ddns security_opt: - no-new-privileges:true - network_mode: 'host' + network_mode: "host" env_file: - ./cloudflare-ddns/secrets/.env environment: diff --git a/stirling-pdf/docker-compose.yml b/stirling-pdf/docker-compose.yml deleted file mode 100644 index 141e5f0..0000000 --- a/stirling-pdf/docker-compose.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: stirlingpdf -services: - app: - image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest - ports: - - '3328:8080' - volumes: - - ./data/trainingData:/usr/share/tessdata - - ./data/extraConfigs:/configs - - ./data/customFiles:/customFiles/ - - ./data/logs:/logs/ - - ./data/pipeline:/pipeline/ - env_file: - - ./secrets/.env - environment: - DISABLE_ADDITIONAL_FEATURES: false - DOCKER_ENABLE_SECURITY: true - LANGS: en_GB - SECURITY_ENABLE_LOGIN: true - SECURITY_LOGINMETHOD: 'oauth2' - SECURITY_OAUTH2_ENABLED: true - SECURITY_OAUTH2_AUTOCREATEUSER: true - SECURITY_OAUTH2_ISSUER: 'https://auth.64815139.xyz' - SECURITY_OAUTH2_CLIENTID: 'GXbZWCII_iRwoQAjtpP6WzXDKagzYZC~dRSq3QMgJyb3RrvcPG0n.Elm3NnEpq8LLh_uZktw' - SECURITY_OAUTH2_BLOCKREGISTRATION: false - SECURITY_OAUTH2_SCOPES: 'openid, profile, email' - SECURITY_OAUTH2_USEASUSERNAME: 'preferred_username' - SECURITY_OAUTH2_PROVIDER: 'Authelia' - SYSTEM_GOOGLEVISIBILITY: false