public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55540 from florianjacob/matomo

Browse Source 
Security: Matomo 3.7.0 -> 3.8.1
This commit is contained in:
Silvan Mosberger 2019-02-14 21:13:57 +01:00 committed by GitHub
commit 3df95cfd9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/web-apps/matomo.nix
View File

@ -49,12 +49,11 @@ in {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "lighttpd"; example = "lighttpd";
# TODO: piwik.php might get renamed to matomo.php in future releases
description = '' description = ''
Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for Matomo if the nginx Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for Matomo if the nginx
option is not used. Either this option or the nginx option is mandatory. option is not used. Either this option or the nginx option is mandatory.
If you want to use another webserver than nginx, you need to set this to that server's user If you want to use another webserver than nginx, you need to set this to that server's user
and pass fastcgi requests to `index.php` and `piwik.php` to this socket. and pass fastcgi requests to `index.php`, `matomo.php` and `piwik.php` (legacy name) to this socket.
''; '';
}; };
@ -265,8 +264,11 @@ in {
locations."= /index.php".extraConfig = '' locations."= /index.php".extraConfig = ''
fastcgi_pass unix:${phpSocket}; fastcgi_pass unix:${phpSocket};
''; '';
# TODO: might get renamed to matomo.php in future versions # allow matomo.php for tracking
# allow piwik.php for tracking locations."= /matomo.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
'';
# allow piwik.php for tracking (deprecated name)
locations."= /piwik.php".extraConfig = '' locations."= /piwik.php".extraConfig = ''
fastcgi_pass unix:${phpSocket}; fastcgi_pass unix:${phpSocket};
''; '';
@ -287,8 +289,11 @@ in {
locations."= /robots.txt".extraConfig = '' locations."= /robots.txt".extraConfig = ''
return 200 "User-agent: *\nDisallow: /\n"; return 200 "User-agent: *\nDisallow: /\n";
''; '';
# TODO: might get renamed to matomo.js in future versions # let browsers cache matomo.js
# let browsers cache piwik.js locations."= /matomo.js".extraConfig = ''
expires 1M;
'';
# let browsers cache piwik.js (deprecated name)
locations."= /piwik.js".extraConfig = '' locations."= /piwik.js".extraConfig = ''
expires 1M; expires 1M;
''; '';

4
pkgs/servers/web-apps/matomo/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "matomo-${version}"; name = "matomo-${version}";
version = "3.7.0"; version = "3.8.1";
src = fetchurl { src = fetchurl {
# TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
# url = "https://builds.matomo.org/${name}.tar.gz"; # url = "https://builds.matomo.org/${name}.tar.gz";
url = "https://builds.matomo.org/piwik-${version}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz";
sha256 = "17ihsmwdfrx1c1v8cp5pc3swx3h0i0l9pjrc8jyww08kavfbfly6"; sha256 = "0ca4fkg2jpkfg0r9hxl45ad5xzz0gxhf404i96j059bn3c41kfi0";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

16
pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
View File

@ -1,13 +1,13 @@
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 9364f49870..2625cbb91b 100644 index 74de2535b4..bc172ad0eb 100644
--- a/plugins/Installation/FormDatabaseSetup.php --- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php
@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2 @@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2
// default values
$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array( $defaults = array(
- 'host' => '127.0.0.1', - 'host' => '127.0.0.1',
+ 'host' => 'localhost', + 'host' => 'localhost',
'type' => $defaultDatabaseType, 'type' => $defaultDatabaseType,
'tables_prefix' => 'matomo_', 'tables_prefix' => 'matomo_',
))); );