aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-08 10:56:40 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-08 10:56:40 +0200
commit3d409f87695d58f3744996b3ecd99ad5095b5783 (patch)
treed0ed0edf1d10ef3f4a8bce6c9154fb3f86fca2db
parenta8bfce17c5eda890d3486357952572f4c1c6b18a (diff)
downloadNix-3d409f87695d58f3744996b3ecd99ad5095b5783.tar.gz
Nix-3d409f87695d58f3744996b3ecd99ad5095b5783.tar.zst
Nix-3d409f87695d58f3744996b3ecd99ad5095b5783.zip
Remove varDir argument for kanboard
-rw-r--r--nixops/modules/websites/tools/tools/kanboard.nix1
-rw-r--r--overlays/kanboard/default.nix3
2 files changed, 2 insertions, 2 deletions
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 {
25 define('DB_HOSTNAME', '${env.postgresql.socket}'); 25 define('DB_HOSTNAME', '${env.postgresql.socket}');
26 define('DB_NAME', '${env.postgresql.database}'); 26 define('DB_NAME', '${env.postgresql.database}');
27 27
28 define('DATA_DIR', '${varDir}');
28 define('LDAP_AUTH', true); 29 define('LDAP_AUTH', true);
29 define('LDAP_SERVER', '${env.ldap.host}'); 30 define('LDAP_SERVER', '${env.ldap.host}');
30 define('LDAP_START_TLS', true); 31 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 @@
1self: super: { 1self: super: {
2 kanboard = { varDir ? "/var/lib/kanboard", kanboard_config ? "/etc/kanboard/config.php" }: 2 kanboard = { kanboard_config ? "/etc/kanboard/config.php" }:
3 super.kanboard.overrideAttrs(old: rec { 3 super.kanboard.overrideAttrs(old: rec {
4 name = "kanboard-${version}"; 4 name = "kanboard-${version}";
5 version = "1.2.9"; 5 version = "1.2.9";
@@ -13,7 +13,6 @@ self: super: {
13 cp -a . $out 13 cp -a . $out
14 ln -s ${kanboard_config} $out/config.php 14 ln -s ${kanboard_config} $out/config.php
15 mv $out/data $out/dataold 15 mv $out/data $out/dataold
16 ln -s ${varDir}/data $out/data
17 ''; 16 '';
18 }); 17 });
19} 18}