X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fmgoblin%2Fdefault.nix;h=5224a0d6b295ab05e6672ae1510f1f8b314cb5a8;hb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;hp=aeae893d6e2b3cc826b36b924d2a12bf5ec23127;hpb=4227853a03923e04daf3dd511a4b5a1ab5d527e7;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/mgoblin/default.nix b/modules/private/websites/tools/mgoblin/default.nix
index aeae893..5224a0d 100644
--- a/modules/private/websites/tools/mgoblin/default.nix
+++ b/modules/private/websites/tools/mgoblin/default.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
-  env = myconfig.env.tools.mediagoblin;
+  env = config.myEnv.tools.mediagoblin;
   cfg = config.myServices.websites.tools.mediagoblin;
   mcfg = config.services.mediagoblin;
 in {
@@ -17,7 +17,12 @@ in {
       user = "mediagoblin";
       group = "mediagoblin";
       permissions = "0400";
-      text = ''
+      text =
+        let
+          psql_url = with env.postgresql; "postgresql://${user}:${password}@:${port}/${database}?host=${socket}";
+          redis_url = with env.redis; "redis+socket://${socket}?virtual_host=${db}";
+        in
+      ''
         [DEFAULT]
         data_basedir = "${mcfg.dataDir}"
 
@@ -26,7 +31,7 @@ in {
         email_sender_address = "mediagoblin@tools.immae.eu"
 
         #sql_engine = sqlite:///%(data_basedir)s/mediagoblin.db
-        sql_engine = ${env.psql_url}
+        sql_engine = ${psql_url}
 
         email_debug_mode = false
         allow_registration = false
@@ -52,19 +57,19 @@ in {
         base_url = /mgoblin_media/
 
         [celery]
-        CELERY_RESULT_DBURI = ${env.redis_url}
-        BROKER_URL = ${env.redis_url}
+        CELERY_RESULT_DBURI = ${redis_url}
+        BROKER_URL = ${redis_url}
         CELERYD_CONCURRENCY = 1
 
         [plugins]
           [[mediagoblin.plugins.geolocation]]
           [[mediagoblin.plugins.ldap]]
             [[[immae.eu]]]
-              LDAP_SERVER_URI = 'ldaps://ldap.immae.eu:636'
-              LDAP_SEARCH_BASE = 'dc=immae,dc=eu'
-              LDAP_BIND_DN = 'cn=mediagoblin,ou=services,dc=immae,dc=eu'
+              LDAP_SERVER_URI = 'ldaps://${env.ldap.host}:636'
+              LDAP_SEARCH_BASE = '${env.ldap.base}'
+              LDAP_BIND_DN = '${env.ldap.dn}'
               LDAP_BIND_PW = '${env.ldap.password}'
-              LDAP_SEARCH_FILTER = '(&(memberOf=cn=users,cn=mediagoblin,ou=services,dc=immae,dc=eu)(uid={username}))'
+              LDAP_SEARCH_FILTER = '${env.ldap.filter}'
               EMAIL_SEARCH_FIELD = 'mail'
           [[mediagoblin.plugins.basicsearch]]
           [[mediagoblin.plugins.piwigo]]