Skip to content

Commit f0ee3fd

Browse files
authored
Merge pull request #21 from MITLibraries/INFRA-506
Matomo 5.2.2 Upgrade
2 parents b9fe38f + 443cfc8 commit f0ee3fd

File tree

136 files changed

+2496
-786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+2496
-786
lines changed

.github/CODEOWNERS

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# CODEOWNERS file (from GitHub template at
2+
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners)
3+
# Each line is a file pattern followed by one or more owners.
4+
5+
################################################################################
6+
# These owners will be the default owners for everything in the repo. Unless a
7+
# later match takes precedence, @cabutlermit will be requested for review when
8+
# someone opens a pull request.This is commented out in favor of using a team
9+
# as the default (see below). It is left here as a comment to indicate the
10+
# primary expert for this code.
11+
# * @cabutlermit
12+
13+
# Teams can be specified as code owners as well. Teams should be identified in
14+
# the format @org/team-name. Teams must have explicit write access to the
15+
# repository.
16+
* @mitlibraries/infraeng-terraform-reviewers
17+
18+
# We set the senior engineer in the team as the owner of the CODEOWNERS file as
19+
# a layer of protection for unauthorized changes.
20+
/.github/CODEOWNERS @cabutlermit

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM matomo:5.1.2
1+
FROM matomo:5.2.2
22

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

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

99
# Preconfigure settings
1010
COPY ./files/config.ini.php /var/www/html/config/config.ini.php

README.md

+11-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,15 @@ Matomo has built-in two-factor authentication, which we enforce for all accounts
8989

9090
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.
9191

92-
## Additional documentation
92+
## Related Assets
9393

94-
* [MIT Libraries dev docs](https://mitlibraries.github.io/guides/misc/matomo.html) - includes information about setting up a website for tracking in Matomo.
95-
* [Matomo help center](https://matomo.org/help/) - offical Matomo docs. Includes user guide, developer guide, FAQ, and community support forum.
94+
* Infrastructure: [mitlib-tf-workloads-matomo](https://github.com/MITLibraries/mitlib-tf-workloads-matomo)
95+
96+
## Maintainers
97+
98+
* Owner: See [CODEOWNERS](./.github/CODEOWNERS)
99+
* Team: See [CODEOWNERS](./.github/CODEOWNERS)
100+
* Last Maintenance: 2025-02
101+
* External Documentation:
102+
* [MIT Libraries dev docs](https://mitlibraries.github.io/guides/misc/matomo.html) - includes information about setting up a website for tracking in Matomo.
103+
* [Matomo help center](https://matomo.org/help/) - offical Matomo docs. Includes user guide, developer guide, FAQ, and community support forum.

files/config.ini.php

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[database]
44
schema = Mariadb
55
charset = utf8mb4
6+
collation = utf8mb4_general_ci
67

78
[General]
89
proxy_client_headers[] = "HTTP_X_FORWARDED_FOR"
@@ -90,6 +91,7 @@
9091
Plugins[] = "Tour"
9192
Plugins[] = "PagePerformance"
9293
Plugins[] = "CustomDimensions"
94+
Plugins[] = "FeatureFlags"
9395
Plugins[] = "MobileAppMeasurable"
9496
Plugins[] = "CustomVariables"
9597
Plugins[] = "EnvironmentVariables"
@@ -159,3 +161,4 @@
159161
PluginsInstalled[] = "MobileAppMeasurable"
160162
PluginsInstalled[] = "PagePerformance"
161163
PluginsInstalled[] = "CustomDimensions"
164+
PluginsInstalled[] = "FeatureFlags"

files/plugin-CustomVariables-4.1.1/Archiver.php

-264
This file was deleted.

files/plugin-CustomVariables-4.1.1/CHANGELOG.md

-9
This file was deleted.

files/plugin-CustomVariables-4.1.1/README.md

-14
This file was deleted.

files/plugin-CustomVariables-4.1.1/config/tracker.php

-2
This file was deleted.

files/plugin-CustomVariables-4.1.1/lang/eu.json

-1
This file was deleted.

files/plugin-CustomVariables-4.1.1/lang/ga.json

-1
This file was deleted.

files/plugin-CustomVariables-4.1.1/lang/gu.json

-1
This file was deleted.

files/plugin-CustomVariables-4.1.1/lang/ms.json

-5
This file was deleted.

files/plugin-CustomVariables-4.1.1/lang/ta.json

-9
This file was deleted.

0 commit comments

Comments
 (0)