Skip to content

Commit 770ac9f

Browse files
authored
Merge: Matomo: various fixes (#380924)
2 parents b02310a + abb123f commit 770ac9f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
2-
index 74de2535b4..bc172ad0eb 100644
2+
index 97c7e74460..d70e83d155 100644
33
--- a/plugins/Installation/FormDatabaseSetup.php
44
+++ b/plugins/Installation/FormDatabaseSetup.php
5-
@@ -82,7 +82,7 @@ class FormDatabaseSetup extends QuickForm2
5+
@@ -96,7 +96,7 @@ class FormDatabaseSetup extends QuickForm2
66

77

88
$defaults = array(
99
- 'host' => '127.0.0.1',
1010
+ 'host' => 'localhost',
1111
'type' => $defaultDatabaseType,
1212
'tables_prefix' => 'matomo_',
13-
);
13+
'schema' => 'Mysql',

pkgs/by-name/ma/matomo/package.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
8181
for f in $filesToFix; do
8282
if [ -f "$f" ]; then
8383
length="$(wc -c "$f" | cut -d' ' -f1)"
84-
hash="$(md5sum "$f" | cut -d' ' -f1)"
84+
hash="$(sha256sum "$f" | cut -d' ' -f1)"
8585
sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
8686
else
8787
echo "INFO(files-to-fix): $f does not exist in this version"

0 commit comments

Comments
 (0)