X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Ftools%2Fmediagoblin%2Fmediagoblin.nix;h=2e62242cb46192fd8d6625e1079b6e5d70597e64;hb=9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d;hp=e94d8a66fa3b883645b815f528dc2e7ef234fbea;hpb=0f3047a77ee1e0b3d943e39d50301ba85821c572;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix b/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
index e94d8a6..2e62242 100644
--- a/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
+++ b/virtual/modules/websites/tools/mediagoblin/mediagoblin.nix
@@ -1,4 +1,4 @@
-{ checkEnv, makeWrapper, stdenv, writeText, fetchurl, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }:
+{ env, makeWrapper, stdenv, writeText, fetchurl, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }:
 let
   plugins = {
     basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec {
@@ -183,10 +183,7 @@ in
       url_scheme = https
       '';
 
-    mediagoblin_local =
-      assert checkEnv "NIXOPS_MEDIAGOBLIN_LDAP_PASSWORD";
-      assert checkEnv "NIXOPS_MEDIAGOBLIN_SQL_URI";
-      writeText "mediagoblin_local.ini" ''
+    mediagoblin_local = writeText "mediagoblin_local.ini" ''
       [DEFAULT]
       data_basedir = "${varDir}"
 
@@ -195,7 +192,7 @@ in
       email_sender_address = "mediagoblin@mail.immae.eu"
 
       #sql_engine = sqlite:///%(data_basedir)s/mediagoblin.db
-      sql_engine = ${builtins.getEnv "NIXOPS_MEDIAGOBLIN_SQL_URI"}
+      sql_engine = ${env.psql_url}
 
       email_debug_mode = false
       allow_registration = false
@@ -232,7 +229,7 @@ in
             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_BIND_PW = '${builtins.getEnv "NIXOPS_MEDIAGOBLIN_LDAP_PASSWORD"}'
+            LDAP_BIND_PW = '${env.ldap.password}'
             LDAP_SEARCH_FILTER = '(&(memberOf=cn=users,cn=mediagoblin,ou=services,dc=immae,dc=eu)(uid={username}))'
             EMAIL_SEARCH_FIELD = 'mail'
         [[mediagoblin.plugins.basicsearch]]