X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fmail%2Froundcubemail.nix;h=7d8e733918237c7f5e8b63489d9076343ef861ec;hp=bb7dee9eba1e97072bc3100f3042220a0ae7c56f;hb=da30ae4ffdd153a1eb32fb86f9ca9a65aa19e4e2;hpb=bd5c5d4e23ebd3863a960976767ed4a83dfd07fe diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix index bb7dee9..7d8e733 100644 --- a/modules/private/websites/tools/mail/roundcubemail.nix +++ b/modules/private/websites/tools/mail/roundcubemail.nix @@ -1,4 +1,4 @@ -{ env, roundcubemail, apacheHttpd }: +{ env, roundcubemail, apacheHttpd, config }: rec { varDir = "/var/lib/roundcubemail"; activationScript = { @@ -75,7 +75,7 @@ rec { $config['mime_types'] = '${apacheHttpd}/conf/mime.types'; ''; }]; - webRoot = (roundcubemail.override { roundcube_config = "/var/secrets/webapps/tools-roundcube"; }).withPlugins (p: [ p.automatic_addressbook p.carddav p.contextmenu p.contextmenu_folder p.html5_notifier p.ident_switch p.message_highlight p.thunderbird_labels ]); + webRoot = (roundcubemail.override { roundcube_config = config.secrets.fullPaths."webapps/tools-roundcube"; }).withPlugins (p: [ p.automatic_addressbook p.carddav p.contextmenu p.contextmenu_folder p.html5_notifier p.ident_switch p.message_highlight p.thunderbird_labels ]); apache = rec { user = "wwwrun"; group = "wwwrun"; @@ -99,7 +99,7 @@ rec { phpFpm = rec { serviceDeps = [ "postgresql.service" ]; basedir = builtins.concatStringsSep ":" ( - [ webRoot "/var/secrets/webapps/tools-roundcube" varDir ] + [ webRoot config.secrets.fullPaths."webapps/tools-roundcube" varDir ] ++ webRoot.plugins ++ webRoot.skins); pool = {