From 4554858ebd991f2ea2e8b3b6d81bc0e5600f4da1 Mon Sep 17 00:00:00 2001 From: DrMxrcy Date: Tue, 21 Mar 2023 04:19:54 -0400 Subject: [PATCH] LittleLink LittleLink Custom Is currently broken, and it seems to be an issue with Traefik. What this Fixes (So Far) - Setup can be completed using the local IP (When trying to use the reverse proxy domain, it redirects to http after the 4th step) - Should fix the permission issue, and enable https redirects by defualt (does not work for setup though) Feel free to drop any suggestions out on this one! --- apps/littlelink-custom/docker-compose.yml | 48 +++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/apps/littlelink-custom/docker-compose.yml b/apps/littlelink-custom/docker-compose.yml index 82eff719..06011241 100644 --- a/apps/littlelink-custom/docker-compose.yml +++ b/apps/littlelink-custom/docker-compose.yml @@ -3,18 +3,52 @@ version: '3.7' services: littlelink-custom: container_name: littlelink-custom - hostname: 'littlelink-custom' + hostname: littlelink-custom + entrypoint: "/bin/sh" + command: + - -c + - | + cp -n -r /htdocs/database/ /data/database + cp -n /htdocs/.env /data/.env + cp -n -r /htdocs/littlelink/images /data/images + cp -n -r /htdocs/themes /data/themes + cp -n -r /htdocs/img /data/img + chown -R apache:apache /data + rm -rf /htdocs/database/ + rm /htdocs/.env + rm -rf /htdocs/littlelink/images + rm -rf /htdocs/themes + rm -rf /htdocs/img + + sed -i 's/FORCE_HTTPS=false/FORCE_HTTPS=true/g' /data/.env + + # uncomment this after first start + # to prevent the installing dialog coming up + # if the container is recreated + # rm /htdocs/INSTALLING + ln -s /data/database /htdocs/database + ln -s /data/.env /htdocs/.env + ln -s /data/images /htdocs/littlelink/images + ln -s /data/themes /htdocs/themes + ln -s /data/img/ /htdocs/img + cd /htdocs + php artisan migrate --force + exec /usr/local/bin/docker-entrypoint.sh server image: 'julianprieber/littlelink-custom:latest' environment: - TZ=${TZ} - SERVER_ADMIN=${LITTLELINK_CUSTOM_EMAIL} - HTTP_SERVER_NAME=${APP_DOMAIN} + - HTTPS_SERVER_NAME=${APP_DOMAIN} - LOG_LEVEL=info - PHP_MEMORY_LIMIT=256M - UPLOAD_MAX_FILESIZE=8M + - DB_CONNECTION=sqlite + - FORCE_HTTPS=true volumes: - - '${APP_DATA_DIR}/data/littlelink/htdocs:/htdocs' + - '${APP_DATA_DIR}/data/littlelink/data:/data' ports: + - 8184:80 - '${APP_PORT}:443' restart: unless-stopped networks: @@ -25,4 +59,12 @@ services: traefik.http.routers.littlelink-custom.entrypoints: websecure traefik.http.routers.littlelink-custom.service: littlelink-custom traefik.http.routers.littlelink-custom.tls.certresolver: myresolver - traefik.http.services.littlelink-custom.loadbalancer.server.port: 443 + traefik.http.routers.littlelink-custom.tls: "true" + traefik.http.services.littlelink-custom.loadbalancer.server.port: 80 + #traefik.http.middlewares.littlelink-custom.headers.customRequestHeaders.X-Forwarded-Proto: https + #traefik.http.middlewares.littlelink-custom.redirectscheme.scheme: https + #traefik.http.middlewares.littlelink-custom.headers.contentSecurityPolicy: upgrade-insecure-requests + #traefik.http.routers.littlelink-custom.middlewares: redirect-to-https + # traefik.http.routers.littlelink-custom.middlewares: default@file,passtls@file + +