Remove varDir argument for kanboard

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / tools / kanboard.nix

diff --git a/nixops/modules/websites/tools/tools/kanboard.nix b/nixops/modules/websites/tools/tools/kanboard.nix
index 35ed2aaace690e8f7db96f1bed37fd4631d028f5..68f92b81a1325e1bd747d3c77f2d6a660ded5fb5 100644 (file)
--- a/nixops/modules/websites/tools/tools/kanboard.nix
+++ b/nixops/modules/websites/tools/tools/kanboard.nix
@@ -1,4 +1,4 @@
-{ lib, env, fetchedGithub, writeText, stdenv, fetchurl }:
+{ env, kanboard }:
 rec {
   varDir = "/var/lib/kanboard";
   activationScript = {
@@ -10,11 +10,11 @@ rec {
       install -TDm644 ${webRoot}/dataold/web.config ${varDir}/data/web.config
     '';
   };
-  keys.tools-kanboard = {
-    destDir = "/run/keys/webapps";
+  keys = [{
+    dest = "webapps/tools-kanboard";
     user = apache.user;
     group = apache.group;
-    permissions = "0700";
+    permissions = "0400";
     text = ''
       <?php
       define('MAIL_FROM', 'kanboard@tools.immae.eu');
@@ -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);
@@ -37,16 +38,8 @@ rec {
       define('LDAP_GROUP_ADMIN_DN', 'cn=admins,cn=kanboard,ou=services,dc=immae,dc=eu');
       ?>
       '';
-  };
-  webRoot = stdenv.mkDerivation (fetchedGithub ./kanboard.json // rec {
-    dontBuild = true;
-    installPhase = ''
-      cp -a . $out
-      ln -s /run/keys/webapps/tools-kanboard $out/config.php
-      mv $out/data $out/dataold
-      ln -s ${varDir}/data $out/data
-      '';
-  });
+  }];
+  webRoot = kanboard { kanboard_config = "/var/secrets/webapps/tools-kanboard"; };
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
@@ -71,8 +64,8 @@ rec {
       '';
   };
   phpFpm = rec {
-    serviceDeps = [ "postgresql.service" "openldap.service" "tools-kanboard-key.service" ];
-    basedir = builtins.concatStringsSep ":" [ webRoot varDir "/run/keys/webapps/tools-kanboard" ];
+    serviceDeps = [ "postgresql.service" "openldap.service" ];
+    basedir = builtins.concatStringsSep ":" [ webRoot varDir "/var/secrets/webapps/tools-kanboard" ];
     socket = "/var/run/phpfpm/kanboard.sock";
     pool = ''
       listen = ${socket}