Skip to content

Commit

Permalink
Merge pull request #21 from MITLibraries/INFRA-506
Browse files Browse the repository at this point in the history
Matomo 5.2.2 Upgrade
  • Loading branch information
cabutlermit authored Feb 5, 2025
2 parents b9fe38f + 443cfc8 commit f0ee3fd
Show file tree
Hide file tree
Showing 136 changed files with 2,496 additions and 786 deletions.
20 changes: 20 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# CODEOWNERS file (from GitHub template at
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners)
# Each line is a file pattern followed by one or more owners.

################################################################################
# These owners will be the default owners for everything in the repo. Unless a
# later match takes precedence, @cabutlermit will be requested for review when
# someone opens a pull request.This is commented out in favor of using a team
# as the default (see below). It is left here as a comment to indicate the
# primary expert for this code.
# * @cabutlermit

# Teams can be specified as code owners as well. Teams should be identified in
# the format @org/team-name. Teams must have explicit write access to the
# repository.
* @mitlibraries/infraeng-terraform-reviewers

# We set the senior engineer in the team as the owner of the CODEOWNERS file as
# a layer of protection for unauthorized changes.
/.github/CODEOWNERS @cabutlermit
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM matomo:5.1.2
FROM matomo:5.2.2

# Add the EnvironmentVariables plugin
COPY ./files/plugin-EnvironmentVariables-5.0.2/ /var/www/html/plugins/EnvironmentVariables
COPY ./files/plugin-EnvironmentVariables-5.0.3/ /var/www/html/plugins/EnvironmentVariables

# Add the CustomVariables plugin
COPY ./files/plugin-CustomVariables-5.0.2/ /var/www/html/plugins/CustomVariables
COPY ./files/plugin-CustomVariables-5.0.4/ /var/www/html/plugins/CustomVariables

# Preconfigure settings
COPY ./files/config.ini.php /var/www/html/config/config.ini.php
Expand Down
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,15 @@ Matomo has built-in two-factor authentication, which we enforce for all accounts

See the official [Recover from lost 2FA](https://matomo.org/faq/how-to/faq_27248) documentation. This allows us to recover the Superuser login if we lose the 2FA information.

## Additional documentation
## Related Assets

* [MIT Libraries dev docs](https://mitlibraries.github.io/guides/misc/matomo.html) - includes information about setting up a website for tracking in Matomo.
* [Matomo help center](https://matomo.org/help/) - offical Matomo docs. Includes user guide, developer guide, FAQ, and community support forum.
* Infrastructure: [mitlib-tf-workloads-matomo](https://github.com/MITLibraries/mitlib-tf-workloads-matomo)

## Maintainers

* Owner: See [CODEOWNERS](./.github/CODEOWNERS)
* Team: See [CODEOWNERS](./.github/CODEOWNERS)
* Last Maintenance: 2025-02
* External Documentation:
* [MIT Libraries dev docs](https://mitlibraries.github.io/guides/misc/matomo.html) - includes information about setting up a website for tracking in Matomo.
* [Matomo help center](https://matomo.org/help/) - offical Matomo docs. Includes user guide, developer guide, FAQ, and community support forum.
3 changes: 3 additions & 0 deletions files/config.ini.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[database]
schema = Mariadb
charset = utf8mb4
collation = utf8mb4_general_ci

[General]
proxy_client_headers[] = "HTTP_X_FORWARDED_FOR"
Expand Down Expand Up @@ -90,6 +91,7 @@
Plugins[] = "Tour"
Plugins[] = "PagePerformance"
Plugins[] = "CustomDimensions"
Plugins[] = "FeatureFlags"
Plugins[] = "MobileAppMeasurable"
Plugins[] = "CustomVariables"
Plugins[] = "EnvironmentVariables"
Expand Down Expand Up @@ -159,3 +161,4 @@
PluginsInstalled[] = "MobileAppMeasurable"
PluginsInstalled[] = "PagePerformance"
PluginsInstalled[] = "CustomDimensions"
PluginsInstalled[] = "FeatureFlags"
264 changes: 0 additions & 264 deletions files/plugin-CustomVariables-4.1.1/Archiver.php

This file was deleted.

9 changes: 0 additions & 9 deletions files/plugin-CustomVariables-4.1.1/CHANGELOG.md

This file was deleted.

14 changes: 0 additions & 14 deletions files/plugin-CustomVariables-4.1.1/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions files/plugin-CustomVariables-4.1.1/config/tracker.php

This file was deleted.

1 change: 0 additions & 1 deletion files/plugin-CustomVariables-4.1.1/lang/eu.json

This file was deleted.

1 change: 0 additions & 1 deletion files/plugin-CustomVariables-4.1.1/lang/ga.json

This file was deleted.

1 change: 0 additions & 1 deletion files/plugin-CustomVariables-4.1.1/lang/gu.json

This file was deleted.

5 changes: 0 additions & 5 deletions files/plugin-CustomVariables-4.1.1/lang/ms.json

This file was deleted.

9 changes: 0 additions & 9 deletions files/plugin-CustomVariables-4.1.1/lang/ta.json

This file was deleted.

Loading

0 comments on commit f0ee3fd

Please sign in to comment.