Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 29069cd2913f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7fcf29993852
Choose a head ref
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 28, 2019

  1. matomo: 3.7.0 -> 3.8.1 

    security update

(cherry picked from commit 2f05980)
    @florianjacob @flokli
    florianjacob authored and flokli committed Mar 28, 2019
    Copy the full SHA
    c569b15 View commit details

  2. nixos/matomo: 3.8.0 introduces matomo.{php,js} files 

    (cherry picked from commit faac33b)
    @florianjacob @flokli
    florianjacob authored and flokli committed Mar 28, 2019
    Copy the full SHA
    1998611 View commit details

  3. matomo: 3.8.1 -> 3.9.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/matomo/versions

(cherry picked from commit 1392434)
    @r-ryantm @flokli
    r-ryantm authored and flokli committed Mar 28, 2019
    Copy the full SHA
    bbded8f View commit details

  4. matomo: update url 

    (cherry picked from commit 4ffd3ad)
    @flokli
    flokli committed Mar 28, 2019
    Copy the full SHA
    c9364bf View commit details

  5. matomo: 3.9.0 -> 3.9.1 

    (cherry picked from commit 26f1943)
    @flokli
    flokli committed Mar 28, 2019
    Copy the full SHA
    7fcf299 View commit details
17 changes: 11 additions & 6 deletions nixos/modules/services/web-apps/matomo.nix
View file
Original file line number Diff line number Diff line change
@@ -38,12 +38,11 @@ in {
type = types.nullOr types.str;
default = null;
example = "lighttpd";
# TODO: piwik.php might get renamed to matomo.php in future releases
description = ''
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.
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.
'';
};

@@ -208,8 +207,11 @@ in {
locations."= /index.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
'';
# TODO: might get renamed to matomo.php in future versions
# allow piwik.php for tracking
# allow matomo.php for tracking
locations."= /matomo.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
'';
# allow piwik.php for tracking (deprecated name)
locations."= /piwik.php".extraConfig = ''
fastcgi_pass unix:${phpSocket};
'';
@@ -230,8 +232,11 @@ in {
locations."= /robots.txt".extraConfig = ''
return 200 "User-agent: *\nDisallow: /\n";
'';
# TODO: might get renamed to matomo.js in future versions
# let browsers cache piwik.js
# let browsers cache matomo.js
locations."= /matomo.js".extraConfig = ''
expires 1M;
'';
# let browsers cache piwik.js (deprecated name)
locations."= /piwik.js".extraConfig = ''
expires 1M;
'';
8 changes: 3 additions & 5 deletions pkgs/servers/web-apps/matomo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,11 @@

stdenv.mkDerivation rec {
name = "matomo-${version}";
version = "3.7.0";
version = "3.9.1";

src = fetchurl {
# 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/piwik-${version}.tar.gz";
sha256 = "17ihsmwdfrx1c1v8cp5pc3swx3h0i0l9pjrc8jyww08kavfbfly6";
url = "https://builds.matomo.org/matomo-${version}.tar.gz";
sha256 = "1y406dnwn4jyrjr2d5qfsg3b4v7nfbh09v74dm1vlcy3mkbhv2bp";
};

nativeBuildInputs = [ makeWrapper ];
16 changes: 8 additions & 8 deletions pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2

// default values
$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
- 'host' => '127.0.0.1',
+ 'host' => 'localhost',
'type' => $defaultDatabaseType,
'tables_prefix' => 'matomo_',
)));

$defaults = array(
- 'host' => '127.0.0.1',
+ 'host' => 'localhost',
'type' => $defaultDatabaseType,
'tables_prefix' => 'matomo_',
);