X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fdiaspora%2Fdefault.nix;h=4fe41152d8cf4259bce8495add0f17d36f320b3d;hb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;hp=6742a8108d437ad56c176b7efca1d6749f0d9afe;hpb=17f6eae9907a122d4472da727ae8b1ac1c40c027;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix
index 6742a81..4fe4115 100644
--- a/modules/private/websites/tools/diaspora/default.nix
+++ b/modules/private/websites/tools/diaspora/default.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
-  env = myconfig.env.tools.diaspora;
+  env = config.myEnv.tools.diaspora;
   root = "/run/current-system/webapps/tools_diaspora";
   cfg = config.myServices.websites.tools.diaspora;
   dcfg = config.services.diaspora;
@@ -10,6 +10,9 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    services.duplyBackup.profiles.diaspora = {
+      rootDir = dcfg.dataDir;
+    };
     users.users.diaspora.extraGroups = [ "keys" ];
 
     secrets.keys = [
@@ -23,7 +26,7 @@ in {
           environment:
             url: "https://diaspora.immae.eu/"
             certificate_authorities: '${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt'
-            redis: '${env.redis_url}'
+            redis: 'redis://${env.redis.host}:${env.redis.port}/${env.redis.db}'
             sidekiq:
             s3:
             assets:
@@ -76,16 +79,16 @@ in {
             inbound:
           ldap:
               enable: true
-              host: ldap.immae.eu
+              host: ${env.ldap.host}
               port: 636
               only_ldap: true
               mail_attribute: mail
               skip_email_confirmation: true
               use_bind_dn: true
-              bind_dn: "cn=diaspora,ou=services,dc=immae,dc=eu"
+              bind_dn: "${env.ldap.dn}"
               bind_pw: "${env.ldap.password}"
-              search_base: "dc=immae,dc=eu"
-              search_filter: "(&(memberOf=cn=users,cn=diaspora,ou=services,dc=immae,dc=eu)(uid=%{username}))"
+              search_base: "${env.ldap.base}"
+              search_filter: "${env.ldap.filter}"
         production:
           environment:
         development:
@@ -150,14 +153,14 @@ in {
       paths = [ dcfg.configDir ];
     };
 
-    services.websites.tools.modules = [
+    services.websites.env.tools.modules = [
       "headers" "proxy" "proxy_http"
     ];
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
       ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora
       '';
-    services.websites.tools.vhostConfs.diaspora = {
+    services.websites.env.tools.vhostConfs.diaspora = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = [ "diaspora.immae.eu" ];