From 2be49ebdf1c48ec182fcac300d43f74327b63dfb Mon Sep 17 00:00:00 2001 From: Lang <7system7@gmail.com> Date: Tue, 18 Aug 2026 17:19:43 +0200 Subject: [PATCH] chg: dev: fix the changing local url names from legacy .local - & change the minio default port #15 --- .env.dist | 10 +++++----- .phpactor.json | 10 ++++++++++ README.md | 6 +++--- compose.yaml | 11 +++++++---- vite.config.js | 2 +- 5 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 .phpactor.json diff --git a/.env.dist b/.env.dist index 9b91ccf..011757e 100644 --- a/.env.dist +++ b/.env.dist @@ -35,7 +35,7 @@ CAP_SECRET_KEY=changethis ###> minio/minio ### MINIO_ROOT_USER=changethis MINIO_ROOT_PASSWORD=changethis -MINIO_ENDPOINT=http://localhost:9000 +MINIO_ENDPOINT=http://localhost:9010 MINIO_PUBLIC_URL=https://your-minio-subdomain.example.com ###< minio/minio ### @@ -47,9 +47,9 @@ MAIL_DOMAIN=localhost ###> symfony/mercure-bundle ### # See https://symfony.com/doc/current/mercure.html#configuration # The URL of the Mercure hub, used by the app to publish updates (can be a local URL) -MERCURE_URL=https://mine.local/.well-known/mercure +MERCURE_URL=https://mine.home.arpa/.well-known/mercure # The public URL of the Mercure hub, used by the browser to connect -MERCURE_PUBLIC_URL=https://mine.local/.well-known/mercure +MERCURE_PUBLIC_URL=https://mine.home.arpa/.well-known/mercure # The secret used to sign the JWTs MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!" # Publisher JWT (must match publisher_jwt in your Caddyfile) @@ -59,8 +59,8 @@ MERCURE_SUBSCRIBER_JWT=changethis ###< symfony/mercure-bundle ### ###> web-auth/webauthn-framework ### -WEBAUTHN_RP_ID=mine.local -WEBAUTHN_ORIGIN=https://mine.local +WEBAUTHN_RP_ID=mine.home.arpa +WEBAUTHN_ORIGIN=https://mine.home.arpa ###< web-auth/webauthn-framework ### ###> symfony/messenger ### diff --git a/.phpactor.json b/.phpactor.json new file mode 100644 index 0000000..fb11f03 --- /dev/null +++ b/.phpactor.json @@ -0,0 +1,10 @@ +{ + "$schema": "/phpactor.schema.json", + "symfony.enabled": true, + "indexer.exclude_patterns": [ + "/vendor/**/Tests/**/*", + "/vendor/**/tests/**/*", + "/var/cache/**/*", + "/vendor/composer/**/*" + ] +} diff --git a/README.md b/README.md index 8394ef3..581fe32 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Created by [SplendidBear](https://www.splendidbear.org). - PostgreSQL 18 - Caddy with FrankenPHP and the Mercure module - MailHog (or any SMTP server on port 1025) -- MinIO (listening on port 9000) +- MinIO (API on port 9010, console on port 9011) ### Docker - Docker Engine 24+ @@ -76,7 +76,7 @@ Edit `.env` and fill in every value. Key ones: | `APP_SECRET` | Random 32-byte hex: `openssl rand -hex 32` | | `POSTGRES_USER/PASSWORD/DB` | Your PostgreSQL credentials | | `MINIO_ROOT_USER/PASSWORD` | MinIO admin credentials | -| `MINIO_ENDPOINT` | `http://localhost:9000` (bare-metal) | +| `MINIO_ENDPOINT` | `http://localhost:9010` (bare-metal) | | `MINIO_PUBLIC_URL` | Public URL browsers use to reach MinIO | | `CAP_API_ENDPOINT` | Full URL of your Cap instance including the site-key path (e.g. `https://cap.example.com/my-site-key/`) | | `CAP_SECRET_KEY` | Secret key from your Cap site dashboard (stored in `PROD_ENV_FILE` Gitea secret on prod) | @@ -128,7 +128,7 @@ Start MinIO and MailHog, then open the URL configured in your Caddy vhost. **Bare-metal** — run once after MinIO is up: ```bash -mc alias set local http://localhost:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD +mc alias set local http://localhost:9010 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD mc mb local/mineseeker echo '' | mc pipe local/mineseeker/media/.keep echo '' | mc pipe local/mineseeker/cache/.keep diff --git a/compose.yaml b/compose.yaml index 9e10418..4388beb 100644 --- a/compose.yaml +++ b/compose.yaml @@ -33,7 +33,7 @@ services: MINIO_ROOT_USER: ${MINIO_ROOT_USER} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} MINIO_ENDPOINT: http://minio:9000 - MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL:-http://localhost:9000} + MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL:-http://localhost:9010} # IMPORTANT: Set TRUSTED_PROXIES to your reverse proxy IP in production. # For Docker on same host, use: 172.17.0.1 (default bridge) or 172.16.0.0/12 (overlay network) # For Kubernetes or external proxy, use the proxy's IP address. @@ -78,7 +78,7 @@ services: MINIO_ROOT_USER: ${MINIO_ROOT_USER} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} MINIO_ENDPOINT: http://minio:9000 - MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL:-http://localhost:9000} + MINIO_PUBLIC_URL: ${MINIO_PUBLIC_URL:-http://localhost:9010} TRUSTED_PROXIES: ${TRUSTED_PROXIES:-127.0.0.1} volumes: - app_var:/app/var @@ -87,14 +87,17 @@ services: condition: service_healthy mail: condition: service_started + healthcheck: + disable: true + minio: image: minio/minio:RELEASE.2025-09-07T16-13-09Z-cpuv1 restart: unless-stopped container_name: '${APP_NAME}-minio' command: server /data --console-address ":9001" ports: - - "9000:9000" - - "9001:9001" + - "9010:9000" + - "9011:9001" environment: MINIO_ROOT_USER: ${MINIO_ROOT_USER} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} diff --git a/vite.config.js b/vite.config.js index 4e7c42f..5f99100 100644 --- a/vite.config.js +++ b/vite.config.js @@ -36,7 +36,7 @@ export default defineConfig({ }, server: { cors: { - origin: ['https://mine.local', 'http://mine.local'], + origin: ['https://mine.home.arpa', 'http://mine.home.arpa'], }, }, css: {