Refactor configuration files for consistency and readability. Update docker-compose and podman-compose to use single quotes for strings. Adjust healthcheck commands to use single quotes. Clean up whitespace in various files, including README and JSON language files, to ensure proper formatting.

This commit is contained in:
Robert Hajdu 2025-08-11 23:01:19 +02:00
parent 610ca29cb5
commit d961c058dd
13 changed files with 6793 additions and 2456 deletions

View file

@ -1,6 +1,5 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: "🤔 Ask a question" - name: '🤔 Ask a question'
url: https://github.com/umami-software/umami/discussions url: https://github.com/umami-software/umami/discussions
about: Ask questions and discuss with other community members. about: Ask questions and discuss with other community members.

View file

@ -3,7 +3,7 @@ services:
umami: umami:
image: ghcr.io/umami-software/umami:postgresql-latest image: ghcr.io/umami-software/umami:postgresql-latest
ports: ports:
- "3000:3000" - '3000:3000'
environment: environment:
DATABASE_URL: postgresql://umami:umami@db:5432/umami DATABASE_URL: postgresql://umami:umami@db:5432/umami
DATABASE_TYPE: postgresql DATABASE_TYPE: postgresql
@ -14,7 +14,7 @@ services:
init: true init: true
restart: always restart: always
healthcheck: healthcheck:
test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"] test: ['CMD-SHELL', 'curl http://localhost:3000/api/heartbeat']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 5 retries: 5
@ -28,7 +28,7 @@ services:
- umami-db-data:/var/lib/postgresql/data - umami-db-data:/var/lib/postgresql/data
restart: always restart: always
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"] test: ['CMD-SHELL', 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 5 retries: 5

View file

@ -178,7 +178,8 @@ if (cloudMode && cloudUrl) {
// Disable standalone output on Windows to avoid symlink errors during build. // Disable standalone output on Windows to avoid symlink errors during build.
// Enable by setting NEXT_STANDALONE=true when needed (e.g., Docker/Linux deploys). // Enable by setting NEXT_STANDALONE=true when needed (e.g., Docker/Linux deploys).
const enableStandaloneOutput = process.platform !== 'win32' && (process.env.NEXT_STANDALONE !== 'false'); const enableStandaloneOutput =
process.platform !== 'win32' && process.env.NEXT_STANDALONE !== 'false';
/** @type {import('next').NextConfig} */ /** @type {import('next').NextConfig} */
export default { export default {

7248
pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,5 @@
# How to deploy umami on podman # How to deploy umami on podman
## How to use ## How to use
1. Rename `env.sample` to `.env` 1. Rename `env.sample` to `.env`
@ -9,7 +8,6 @@
If you need to stop umami, you can do so by running `podman-compose down`. If you need to stop umami, you can do so by running `podman-compose down`.
### Install systemd service (optional) ### Install systemd service (optional)
If you want to install a systemd service to run umami, you can use the provided If you want to install a systemd service to run umami, you can use the provided
@ -17,7 +15,6 @@ systemd service.
Edit `umami.service` and change these two variables: Edit `umami.service` and change these two variables:
WorkingDirectory=/opt/apps/umami WorkingDirectory=/opt/apps/umami
EnvironmentFile=/opt/apps/umami/.env EnvironmentFile=/opt/apps/umami/.env
@ -30,7 +27,6 @@ located.
You can run the script `install-systemd-user-service` to install the systemd You can run the script `install-systemd-user-service` to install the systemd
service under the current user. service under the current user.
./install-systemd-user-service ./install-systemd-user-service
Note: this script will enable the service and also start it. So it will assume Note: this script will enable the service and also start it. So it will assume
@ -39,8 +35,6 @@ down using:
podman-compose down podman-compose down
## Compatibility ## Compatibility
These files should be compatible with podman 4.3+. These files should be compatible with podman 4.3+.

View file

@ -1,11 +1,11 @@
version: "3.8" version: '3.8'
services: services:
umami: umami:
container_name: umami container_name: umami
image: ghcr.io/umami-software/umami:postgresql-latest image: ghcr.io/umami-software/umami:postgresql-latest
ports: ports:
- "127.0.0.1:3000:3000" - '127.0.0.1:3000:3000'
environment: environment:
DATABASE_URL: ${DATABASE_URL} DATABASE_URL: ${DATABASE_URL}
DATABASE_TYPE: ${DATABASE_TYPE} DATABASE_TYPE: ${DATABASE_TYPE}
@ -16,7 +16,7 @@ services:
init: true init: true
restart: always restart: always
healthcheck: healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:3000/api/heartbeat || exit 1"] test: ['CMD-SHELL', 'curl -f http://localhost:3000/api/heartbeat || exit 1']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 5 retries: 5
@ -32,7 +32,7 @@ services:
- umami-db-data:/var/lib/postgresql/data:Z - umami-db-data:/var/lib/postgresql/data:Z
restart: always restart: always
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}']
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 5 retries: 5

View file

@ -10,8 +10,8 @@ export default {
}, },
plugins: [ plugins: [
replace({ replace({
'__COLLECT_API_HOST__': process.env.COLLECT_API_HOST || '', __COLLECT_API_HOST__: process.env.COLLECT_API_HOST || '',
'__COLLECT_API_ENDPOINT__': process.env.COLLECT_API_ENDPOINT || '/api/send', __COLLECT_API_ENDPOINT__: process.env.COLLECT_API_ENDPOINT || '/api/send',
delimiters: ['', ''], delimiters: ['', ''],
preventAssignment: true, preventAssignment: true,
}), }),

View file

@ -276,5 +276,4 @@
"message.viewed-page": "Vist side", "message.viewed-page": "Vist side",
"message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}", "message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}",
"message.visitors-dropped-off": "Besøkende falt fra" "message.visitors-dropped-off": "Besøkende falt fra"
} }