diff options
| author | Olivier Marty <omarty@google.com> | 2020-10-14 23:25:54 +0200 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2022-02-16 22:21:44 +0300 |
| commit | 7852ea15964f685bd73eaa7e11279668ec5c0d40 (patch) | |
| tree | de2f6c57a17d7c3be19690542d72e0e4a970d251 /pkgs/servers/web-apps/matomo/default.nix | |
| parent | 04af4059cf7e2e14ac3bd217d30e5d8922ffef74 (diff) | |
| download | nixpkgs-7852ea15964f685bd73eaa7e11279668ec5c0d40.tar nixpkgs-7852ea15964f685bd73eaa7e11279668ec5c0d40.tar.gz nixpkgs-7852ea15964f685bd73eaa7e11279668ec5c0d40.tar.bz2 nixpkgs-7852ea15964f685bd73eaa7e11279668ec5c0d40.tar.lz nixpkgs-7852ea15964f685bd73eaa7e11279668ec5c0d40.tar.xz nixpkgs-7852ea15964f685bd73eaa7e11279668ec5c0d40.tar.zst nixpkgs-7852ea15964f685bd73eaa7e11279668ec5c0d40.zip | |
nixos/matomo: point path.geoip2 outside of the nix store.
path.geoip2 pointed to the nix store which is read-only. Matomo was failing to download a geoip2 database. See #64759.
Diffstat (limited to 'pkgs/servers/web-apps/matomo/default.nix')
| -rw-r--r-- | pkgs/servers/web-apps/matomo/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index ad8dc85f70f..aa371223cf0 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -32,14 +32,19 @@ let nativeBuildInputs = [ makeWrapper ]; - # make-localhost-default-database-server.patch: - # This changes the default value of the database server field - # from 127.0.0.1 to localhost. - # unix socket authentication only works with localhost, - # but password-based SQL authentication works with both. - # TODO: is upstream interested in this? - # -> discussion at https://github.com/matomo-org/matomo/issues/12646 - patches = [ ./make-localhost-default-database-host.patch ]; + patches = [ + # This changes the default value of the database server field + # from 127.0.0.1 to localhost. + # unix socket authentication only works with localhost, + # but password-based SQL authentication works with both. + # TODO: is upstream interested in this? + # -> discussion at https://github.com/matomo-org/matomo/issues/12646 + ./make-localhost-default-database-host.patch + + # This changes the default config for path.geoip2 so that it doesn't point + # to the nix store. + ./change-path-geoip2.patch + ]; # this bootstrap.php adds support for getting PIWIK_USER_PATH # from an environment variable. Point it to a mutable location @@ -73,6 +78,7 @@ let "misc/composer/build-xhprof.sh" "misc/composer/clean-xhprof.sh" "misc/cron/archive.sh" + "plugins/GeoIp2/config/config.php" "plugins/Installation/FormDatabaseSetup.php" "vendor/pear/archive_tar/sync-php4" "vendor/szymach/c-pchart/coverage.sh" |