watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-19 12:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
.github/ISSUE_TEMPLATE/config.yml vendored
View file

@ -1,6 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: "🤔 Ask a question"
- name: '🤔 Ask a question'
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.

2
.github/workflows/cd-manual.yml vendored
View file

@ -55,4 +55,4 @@ jobs:
buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
registry: docker.io
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
password: ${{ secrets.DOCKER_PASSWORD }}

4
.github/workflows/cd.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
- name: Set env
run: |
echo "NOW=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
- name: Generate tags
id: generate_tags
run: |
@ -47,4 +47,4 @@ jobs:
buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
registry: docker.io
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
password: ${{ secrets.DOCKER_PASSWORD }}

32
.github/workflows/ci.yml vendored
View file

@ -18,21 +18,21 @@ jobs:
strategy:
matrix:
include:
- node-version: 18.18
db-type: postgresql
- node-version: 18.18
db-type: mysql
- node-version: 18.18
db-type: postgresql
- node-version: 18.18
db-type: mysql
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
env:
DATABASE_TYPE: ${{ matrix.db-type }}
- run: npm install --global yarn
- run: yarn install
- run: yarn test
- run: yarn build
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
env:
DATABASE_TYPE: ${{ matrix.db-type }}
- run: npm install --global yarn
- run: yarn install
- run: yarn test
- run: yarn build

6
docker-compose.yml
View file

@ -3,7 +3,7 @@ services:
umami:
image: ghcr.io/umami-software/umami:postgresql-latest
ports:
- "3000:3000"
- '3000:3000'
environment:
DATABASE_URL: postgresql://umami:umami@db:5432/umami
DATABASE_TYPE: postgresql
@ -14,7 +14,7 @@ services:
init: true
restart: always
healthcheck:
test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]
test: ['CMD-SHELL', 'curl http://localhost:3000/api/heartbeat']
interval: 5s
timeout: 5s
retries: 5
@ -28,7 +28,7 @@ services:
- umami-db-data:/var/lib/postgresql/data
restart: always
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
timeout: 5s
retries: 5

3
next.config.mjs
View file

@ -178,7 +178,8 @@ if (cloudMode && cloudUrl) {
// Disable standalone output on Windows to avoid symlink errors during build.
// 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} */
export default {

9132
pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff

16
podman/README.md
View file

@ -1,6 +1,5 @@
# How to deploy umami on podman
## How to use
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`.
### Install systemd service (optional)
If you want to install a systemd service to run umami, you can use the provided
@ -17,9 +15,8 @@ systemd service.
Edit `umami.service` and change these two variables:
WorkingDirectory=/opt/apps/umami
EnvironmentFile=/opt/apps/umami/.env
WorkingDirectory=/opt/apps/umami
EnvironmentFile=/opt/apps/umami/.env
`WorkingDirectory` should be changed to the path in which `podman-compose.yml`
is located.
@ -30,16 +27,13 @@ located.
You can run the script `install-systemd-user-service` to install the systemd
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
that umami is not currently running. If you started it previously, bring it
that umami is not currently running. If you started it previously, bring it
down using:
podman-compose down
podman-compose down
## Compatibility

8
podman/podman-compose.yml
View file

@ -1,11 +1,11 @@
version: "3.8"
version: '3.8'
services:
umami:
container_name: umami
image: ghcr.io/umami-software/umami:postgresql-latest
ports:
- "127.0.0.1:3000:3000"
- '127.0.0.1:3000:3000'
environment:
DATABASE_URL: ${DATABASE_URL}
DATABASE_TYPE: ${DATABASE_TYPE}
@ -16,7 +16,7 @@ services:
init: true
restart: always
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
timeout: 5s
retries: 5
@ -32,7 +32,7 @@ services:
- umami-db-data:/var/lib/postgresql/data:Z
restart: always
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
timeout: 5s
retries: 5

34
public/site.webmanifest
View file

@ -1,19 +1,19 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
"name": "",
"short_name": "",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}

4
rollup.tracker.config.mjs
View file

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

2
src/lang/de-CH.json
View file

@ -276,4 +276,4 @@
"message.viewed-page": "Siite agluegt",
"message.visitor-log": "Bsuecher us {country} nutzt {browser} uf {os} {device}",
"message.visitors-dropped-off": "Bsuercher verlore"
}
}

1
src/lang/nb-NO.json
View file

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