diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-22 12:49:20 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-22 12:49:20 +0100 |
commit | 9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d (patch) | |
tree | 0b011ca0aeeef02dce03a3c825d9a037c5cfc01a /virtual/modules/websites/tools/mediagoblin | |
parent | 0f3047a77ee1e0b3d943e39d50301ba85821c572 (diff) | |
download | Nix-9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d.tar.gz Nix-9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d.tar.zst Nix-9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d.zip |
Remove use of environment variables
Fixes https://git.immae.eu/mantisbt/view.php?id=113
Diffstat (limited to 'virtual/modules/websites/tools/mediagoblin')
-rw-r--r-- | virtual/modules/websites/tools/mediagoblin/default.nix | 5 | ||||
-rw-r--r-- | virtual/modules/websites/tools/mediagoblin/mediagoblin.nix | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/virtual/modules/websites/tools/mediagoblin/default.nix b/virtual/modules/websites/tools/mediagoblin/default.nix index 99bdce1..5f60503 100644 --- a/virtual/modules/websites/tools/mediagoblin/default.nix +++ b/virtual/modules/websites/tools/mediagoblin/default.nix | |||
@@ -1,7 +1,8 @@ | |||
1 | { lib, pkgs, config, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | mediagoblin = pkgs.callPackage ./mediagoblin.nix { | 3 | mediagoblin = pkgs.callPackage ./mediagoblin.nix { |
4 | inherit (mylibs) checkEnv fetchedGit fetchedGithub; | 4 | inherit (mylibs) fetchedGit fetchedGithub; |
5 | env = myconfig.env.tools.mediagoblin; | ||
5 | }; | 6 | }; |
6 | 7 | ||
7 | cfg = config.services.myWebsites.tools.mediagoblin; | 8 | cfg = config.services.myWebsites.tools.mediagoblin; |
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 @@ | |||
1 | { checkEnv, makeWrapper, stdenv, writeText, fetchurl, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }: | 1 | { env, makeWrapper, stdenv, writeText, fetchurl, fetchedGit, fetchedGithub, which, python3, pkgs, automake, autoconf, nodejs, nodePackages, git, cacert }: |
2 | let | 2 | let |
3 | plugins = { | 3 | plugins = { |
4 | basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec { | 4 | basicsearch = stdenv.mkDerivation (fetchedGithub ./mediagoblin-plugin-basicsearch.json // rec { |
@@ -183,10 +183,7 @@ in | |||
183 | url_scheme = https | 183 | url_scheme = https |
184 | ''; | 184 | ''; |
185 | 185 | ||
186 | mediagoblin_local = | 186 | mediagoblin_local = writeText "mediagoblin_local.ini" '' |
187 | assert checkEnv "NIXOPS_MEDIAGOBLIN_LDAP_PASSWORD"; | ||
188 | assert checkEnv "NIXOPS_MEDIAGOBLIN_SQL_URI"; | ||
189 | writeText "mediagoblin_local.ini" '' | ||
190 | [DEFAULT] | 187 | [DEFAULT] |
191 | data_basedir = "${varDir}" | 188 | data_basedir = "${varDir}" |
192 | 189 | ||
@@ -195,7 +192,7 @@ in | |||
195 | email_sender_address = "mediagoblin@mail.immae.eu" | 192 | email_sender_address = "mediagoblin@mail.immae.eu" |
196 | 193 | ||
197 | #sql_engine = sqlite:///%(data_basedir)s/mediagoblin.db | 194 | #sql_engine = sqlite:///%(data_basedir)s/mediagoblin.db |
198 | sql_engine = ${builtins.getEnv "NIXOPS_MEDIAGOBLIN_SQL_URI"} | 195 | sql_engine = ${env.psql_url} |
199 | 196 | ||
200 | email_debug_mode = false | 197 | email_debug_mode = false |
201 | allow_registration = false | 198 | allow_registration = false |
@@ -232,7 +229,7 @@ in | |||
232 | LDAP_SERVER_URI = 'ldaps://ldap.immae.eu:636' | 229 | LDAP_SERVER_URI = 'ldaps://ldap.immae.eu:636' |
233 | LDAP_SEARCH_BASE = 'dc=immae,dc=eu' | 230 | LDAP_SEARCH_BASE = 'dc=immae,dc=eu' |
234 | LDAP_BIND_DN = 'cn=mediagoblin,ou=services,dc=immae,dc=eu' | 231 | LDAP_BIND_DN = 'cn=mediagoblin,ou=services,dc=immae,dc=eu' |
235 | LDAP_BIND_PW = '${builtins.getEnv "NIXOPS_MEDIAGOBLIN_LDAP_PASSWORD"}' | 232 | LDAP_BIND_PW = '${env.ldap.password}' |
236 | LDAP_SEARCH_FILTER = '(&(memberOf=cn=users,cn=mediagoblin,ou=services,dc=immae,dc=eu)(uid={username}))' | 233 | LDAP_SEARCH_FILTER = '(&(memberOf=cn=users,cn=mediagoblin,ou=services,dc=immae,dc=eu)(uid={username}))' |
237 | EMAIL_SEARCH_FIELD = 'mail' | 234 | EMAIL_SEARCH_FIELD = 'mail' |
238 | [[mediagoblin.plugins.basicsearch]] | 235 | [[mediagoblin.plugins.basicsearch]] |