From: Ismaƫl Bouya Date: Wed, 8 May 2019 08:56:40 +0000 (+0200) Subject: Remove varDir argument for kanboard X-Git-Tag: nur_publish~51 X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=3d409f87695d58f3744996b3ecd99ad5095b5783 Remove varDir argument for kanboard --- diff --git a/nixops/modules/websites/tools/tools/kanboard.nix b/nixops/modules/websites/tools/tools/kanboard.nix index 9966a37..68f92b8 100644 --- a/nixops/modules/websites/tools/tools/kanboard.nix +++ b/nixops/modules/websites/tools/tools/kanboard.nix @@ -25,6 +25,7 @@ rec { define('DB_HOSTNAME', '${env.postgresql.socket}'); define('DB_NAME', '${env.postgresql.database}'); + define('DATA_DIR', '${varDir}'); define('LDAP_AUTH', true); define('LDAP_SERVER', '${env.ldap.host}'); define('LDAP_START_TLS', true); diff --git a/overlays/kanboard/default.nix b/overlays/kanboard/default.nix index eeae8db..81b39fe 100644 --- a/overlays/kanboard/default.nix +++ b/overlays/kanboard/default.nix @@ -1,5 +1,5 @@ self: super: { - kanboard = { varDir ? "/var/lib/kanboard", kanboard_config ? "/etc/kanboard/config.php" }: + kanboard = { kanboard_config ? "/etc/kanboard/config.php" }: super.kanboard.overrideAttrs(old: rec { name = "kanboard-${version}"; version = "1.2.9"; @@ -13,7 +13,6 @@ self: super: { cp -a . $out ln -s ${kanboard_config} $out/config.php mv $out/data $out/dataold - ln -s ${varDir}/data $out/data ''; }); }