mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
nixos/matomo: improve serverName default
when we need to change it anyway for the rename.
This commit is contained in:
parent
48e449ee70
commit
885e762d47
|
@ -255,6 +255,18 @@ following incompatible changes:</para>
|
|||
All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The default <option>serverName</option> for the nginx configuration changed from
|
||||
<literal>piwik.${config.networking.hostName}</literal> to
|
||||
<literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
|
||||
if <option>config.networking.domain</option> is set,
|
||||
<literal>matomo.${config.networking.hostName}</literal> if it is not set.
|
||||
If you change your <option>serverName</option>, remember you'll need to update the
|
||||
<literal>trustedHosts[]</literal> array in <filename>/var/lib/matomo/config/config.ini.php</filename>
|
||||
as well.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>piwik</literal> user was renamed to <literal>matomo</literal>.
|
||||
|
|
|
@ -14,6 +14,11 @@ let
|
|||
phpExecutionUnit = "phpfpm-${pool}";
|
||||
databaseService = "mysql.service";
|
||||
|
||||
fqdn =
|
||||
let
|
||||
join = hostName: domain: hostName + optionalString (domain != null) ".${domain}";
|
||||
in join config.networking.hostName config.networking.domain;
|
||||
|
||||
in {
|
||||
options = {
|
||||
services.matomo = {
|
||||
|
@ -75,15 +80,19 @@ in {
|
|||
);
|
||||
default = null;
|
||||
example = {
|
||||
serverName = "stats.$\{config.networking.hostName\}";
|
||||
serverAliases = [
|
||||
"matomo.$\{config.networking.domain\}"
|
||||
"stats.$\{config.networking.domain\}"
|
||||
];
|
||||
enableACME = false;
|
||||
};
|
||||
description = ''
|
||||
With this option, you can customize an nginx virtualHost which already has sensible defaults for matomo.
|
||||
Either this option or the webServerUser option is mandatory.
|
||||
Set this to {} to just enable the virtualHost if you don't need any customization.
|
||||
If enabled, then by default, the serverName is ${user}.$\{config.networking.hostName\}, SSL is active,
|
||||
and certificates are acquired via ACME.
|
||||
If enabled, then by default, the <option>serverName</option> is
|
||||
<literal>${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}</literal>,
|
||||
SSL is active, and certificates are acquired via ACME.
|
||||
If this is set to null (the default), no nginx virtualHost will be configured.
|
||||
'';
|
||||
};
|
||||
|
@ -183,8 +192,7 @@ in {
|
|||
# References:
|
||||
# https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
|
||||
# https://github.com/perusio/piwik-nginx
|
||||
# TODO: better default
|
||||
"${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx {
|
||||
"${user}.${fqdn}" = mkMerge [ cfg.nginx {
|
||||
# don't allow to override the root easily, as it will almost certainly break matomo.
|
||||
# disadvantage: not shown as default in docs.
|
||||
root = mkForce "${pkgs.matomo}/share";
|
||||
|
|
Loading…
Reference in a new issue