Skip to content

Commit

Permalink
Merge pull request #44 from Digitalist-Open-Cloud/cspell_plus_spellin…
Browse files Browse the repository at this point in the history
…g_and_cleanup

some cleanup
  • Loading branch information
mikkeschiren authored Jan 25, 2025
2 parents 15958f4 + d3486f5 commit 0c378f2
Show file tree
Hide file tree
Showing 9 changed files with 122 additions and 19 deletions.
70 changes: 70 additions & 0 deletions .cspell/dictionary
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
autorestart
binhex
corearchive
datatable
digitalist
Ecommerce
extralabels
fastcgi
firstuser
fontobject
geoip
hipages
infile
jardiff
jnlp
jquery
LEGALNOTICE
makeself
mathml
matomo
MATOMO
maxbytes
mmdb
mpegurl
MSIE
msvideo
msword
mynamespace
mysqli
nindent
numProcs
officedocument
ondemand
opcache
opendocument
openxmlformats
phpfpm
piwik
presentationml
queuedtracking
queuedtrackingmonitor
queuedtrackingprocess
quicktime
realaudio
scheduledtasks
spreadsheetml
startretries
stuffit
subtable
supervisord
svgz
tagmanager
uwsgi
wbmp
webfonts
webp
Widgetize
wmlc
wordprocessingml
xpinstall
xspf
nosniff
keepalive
sendfile
scgi
http_referer
heatmapsessionsrecording
dbtable
FMQB
Blackfire
11 changes: 11 additions & 0 deletions .github/workflows/spelling.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: 'Check spelling'
on: # rebuild any PRs and main branch changes
pull_request:
push:

jobs:
spellcheck: # run the action
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: streetsidesoftware/cspell-action@v6
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Change log

## [11.0.48] - 2025-01-25

### Added

- cspell CI checker.

### Changed

- Image to deploy

### Removed

- Blackfire nginx config.

## [11.0.39] - 2024-10-01

### Added
Expand Down
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ Add your overrides add deploy Matomo:
helm upgrade -i --namespace=mynamespace -f overrides.yaml -i matomo oci://registry-1.docker.io/digitalist/matomo
```


### Classic

```
helm repo add matomo-kubernetes https://digitalist-open-cloud.github.io/matomo-kubernetes/
```

Download values so you can override it with your own changes.

```
Expand All @@ -78,7 +71,7 @@ helm upgrade --namespace=mynamespace -f overrides.yaml -i my-matomo matomo-kuber
| `templates/configmap-matomo-dashboard-php.yaml` | Contains the php conf file for the Matomo dashboard. |
| `templates/configmap-nginx-matomo-dashboard.yaml` | Contains the nginx conf file for the Matomo dashboard. |
| `templates/configmap-nginx-matomo-tracker.yaml` | Contains the nginx conf file for the Matomo tracker script. |
| `templates/configmap-supervisor-queuedtrackingprocess.yaml` | Contains the supervisor.d config for the queeudtrackingprocess |
| `templates/configmap-supervisor-queuedtrackingprocess.yaml` | Contains the supervisor.d config for the queuedtrackingprocess |
| `templates/cronjob-matomo-backup-db.yaml` | Cronjob - For backing up database to Openstack Object storage. |
| `templates/cronjob-matomo-corearchive.yaml` | Cronjob - Creates visitor reports in Matomo. |
| `templates/cronjob-matomo-scheduled-tasks.yaml` | Cronjob - Runs scheduled tasks in Matomo, like sending e-mail reports on scheduled time. |
Expand All @@ -95,7 +88,7 @@ Check file for default values.

| Key | Description |
| --- | ----------- |
| `changeCause` | Changes the changecause, which is added in all deployment files, will trigger a re-deployment of all pods. |
| `changeCause` | Changes the change cause, which is added in all deployment files, will trigger a re-deployment of all pods. |
| `namespace` | Describes what namespace Matomo should be deployed to. |
| `nginxWorkerProcesses` | How many cpu cores should nginx use, should be same as number of cpu cores on server. |
| `queuedTrackingProcess.numProcs` | How many processes should supervisor.d use for running `./console queuedtracking:process`. |
Expand All @@ -114,7 +107,7 @@ Check file for default values.
| `matomo.cronJobs.swiftDbBackup.schedule` | Cronjob - swiftDbBackup - How often should we run the database backup cronjob. |
| `matomo.cronJobs.swiftDbBackup.namePrefix` | Cronjob - swiftDbBackup - What should the prefix of the filename on database backups? |
| `matomo.cronJobs.swiftDbBackup.deleteBackupAfter` | Cronjob - swiftDbBackup - How many days should we keep the backups? |
| `matomo.cronJobs.swiftDbBackup.openStackSecret` | Cronjob - swiftDbBackup - Name of the Kubernetes secret where the Openstack Swift authenticaion is. |
| `matomo.cronJobs.swiftDbBackup.openStackSecret` | Cronjob - swiftDbBackup - Name of the Kubernetes secret where the Openstack Swift authentication is. |
| `matomo.dashboard.replicas` | Number of replicas we should run of the Matomo dashboard. |
| `matomo.dashboard.hostname` | Hostname for the Matomo dashboard. |
| `matomo.dashboard.tls` | Should we runt tls for the dashboard or not. |
Expand Down
4 changes: 2 additions & 2 deletions charts/matomo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: "5.1.2"
appVersion: "5.2.1"
description: A Helm chart for Matomo
name: matomo
version: 11.0.47
version: 11.0.48
4 changes: 2 additions & 2 deletions charts/matomo/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Thank you for installing {{ .Chart.Name }} from Digitalist.

Your release is named {{ .Release.Name }}.

At post install job is runned on the install that creates the first
site, this couuld fail a copule of times, but should succeed in the end.
At post install, job tuns on the install, and creates the first
site, this could fail a couple of times, but should succeed in the end.

After installation is complete, you can access your website by this url:
{{ .Values.matomo.dashboard.hostname }}
Expand Down
3 changes: 0 additions & 3 deletions charts/matomo/templates/configmap-nginx-matomo-dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ data:
return 404;
}
fastcgi_cache_bypass $http_x_blackfire_query;
fastcgi_no_cache $http_x_blackfire_query;
proxy_read_timeout 600s;
proxy_send_timeout 600s;
proxy_connect_timeout 600s;
Expand Down
4 changes: 2 additions & 2 deletions charts/matomo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ matomo:
## imagePullSecrets:
## - myRegistryKeySecretName
imagePullSecrets: []
image: digitalist/matomo:5.1.2
image: digitalist/matomo:5.2.1
runAsUser: 82
installCommand: ./console plugin:activate ExtraTools && ./console matomo:install --install-file=/tmp/matomo/install.json --force --do-not-drop-db
# Post install for helm chart. Starts a post-install-job.
Expand All @@ -32,7 +32,7 @@ matomo:
preUpgradeCommand: ""
extralabels: {}
## If you have a premium license for plugins, set it here.
## you need to create the secret before refering it.
## you need to create the secret before referring it.
## As:
## license:
## secretKeyRef:
Expand Down
18 changes: 18 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": "0.2",
"dictionaryDefinitions": [
{
"name": "dictionary",
"path": "./.cspell/dictionary",
"addWords": true
}
],
"dictionaries": [
"dictionary",
"k8s"
],
"words": [],
"ignoreWords": [],
"language": "en,en-GB",
"useGitignore": true
}

0 comments on commit 0c378f2

Please sign in to comment.