diff options
author | Florian Jacob <projects+git@florianjacob.de> | 2018-05-15 15:30:54 +0200 |
---|---|---|
committer | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-10-13 15:25:12 +0000 |
commit | a1825aecfcbf4605047cbb0cb33241e25dcd0b38 (patch) | |
tree | ddea2dbbd36ac0a333934212ed0b16dfd751639a /nixos/modules/services/web-apps | |
parent | 83f6cf82c57ef2cec7df1fff81ca5dff791e44d3 (diff) | |
download | nixlib-a1825aecfcbf4605047cbb0cb33241e25dcd0b38.tar nixlib-a1825aecfcbf4605047cbb0cb33241e25dcd0b38.tar.gz nixlib-a1825aecfcbf4605047cbb0cb33241e25dcd0b38.tar.bz2 nixlib-a1825aecfcbf4605047cbb0cb33241e25dcd0b38.tar.lz nixlib-a1825aecfcbf4605047cbb0cb33241e25dcd0b38.tar.xz nixlib-a1825aecfcbf4605047cbb0cb33241e25dcd0b38.tar.zst nixlib-a1825aecfcbf4605047cbb0cb33241e25dcd0b38.zip |
nixos/matomo: introduce services.matomo.package option
Diffstat (limited to 'nixos/modules/services/web-apps')
-rw-r--r-- | nixos/modules/services/web-apps/matomo.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index fbbd7715c6b3..9fddf8320748 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -34,6 +34,13 @@ in { ''; }; + package = mkOption { + type = types.package; + description = "Matomo package to use"; + default = pkgs.matomo; + defaultText = "pkgs.matomo"; + }; + webServerUser = mkOption { type = types.nullOr types.str; default = null; @@ -124,7 +131,7 @@ in { # the update part of the script can only work if the database is already up and running requires = [ databaseService ]; after = [ databaseService ]; - path = [ pkgs.matomo ]; + path = [ cfg.package ]; serviceConfig = { Type = "oneshot"; User = user; @@ -151,7 +158,7 @@ in { # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group # Copy config folder chmod g+s "${dataDir}" - cp -r "${pkgs.matomo}/config" "${dataDir}/" + cp -r "${cfg.package}/config" "${dataDir}/" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done @@ -164,7 +171,7 @@ in { systemd.services.${phpExecutionUnit} = { # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart - restartTriggers = [ pkgs.matomo ]; + restartTriggers = [ cfg.package ]; # stop config.ini.php from getting written with read permission for others serviceConfig.UMask = "0007"; }; @@ -195,7 +202,7 @@ in { "${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"; + root = mkForce "${cfg.package}/share"; # define locations here instead of as the submodule option's default # so that they can easily be extended with additional locations if required |