matomo: make the substituteInPlace a proper patch, improve description

Changed files
+22 -4
pkgs
+9 -4
pkgs/servers/web-apps/matomo/default.nix
···
nativeBuildInputs = [ makeWrapper ];
-
# regarding the 127.0.0.1 substitute:
-
# This replaces the default value of the database server field.
# unix socket authentication only works with localhost,
# but password-based SQL authentication works with both.
postPatch = ''
-
substituteInPlace plugins/Installation/FormDatabaseSetup.php \
-
--replace "=> '127.0.0.1'," "=> 'localhost',"
cp ${./bootstrap.php} bootstrap.php
'';
···
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?
+
patches = [ ./make-localhost-default-database-host.patch ];
+
+
# this bootstrap.php adds support for getting PIWIK_USER_PATH
+
# from an environment variable. Point it to a mutable location
+
# to be able to use matomo read-only from the nix store
postPatch = ''
cp ${./bootstrap.php} bootstrap.php
'';
+13
pkgs/servers/web-apps/matomo/make-localhost-default-database-host.patch
···
···
+
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
+
index 9364f49870..2625cbb91b 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_',
+
)));