From ab8f306d7c2c49b8116e1af7b355ed2384617ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 12 Dec 2019 00:24:23 +0100 Subject: Add specification for the private config file as a module. --- modules/private/websites/tools/tools/default.nix | 18 +++++++++--------- modules/private/websites/tools/tools/kanboard.nix | 4 ++-- modules/private/websites/tools/tools/shaarli.nix | 2 +- modules/private/websites/tools/tools/ttrss.nix | 8 ++++---- modules/private/websites/tools/tools/wallabag.nix | 10 +++++----- modules/private/websites/tools/tools/ympd.nix | 2 +- modules/private/websites/tools/tools/yourls.nix | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) (limited to 'modules/private/websites/tools/tools') diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 3cf3e8e..5a0c196 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix @@ -1,39 +1,39 @@ -{ lib, pkgs, config, myconfig, ... }: +{ lib, pkgs, config, ... }: let adminer = pkgs.callPackage ./adminer.nix { inherit (pkgs.webapps) adminer; }; ympd = pkgs.callPackage ./ympd.nix { - env = myconfig.env.tools.ympd; + env = config.myEnv.tools.ympd; }; ttrss = pkgs.callPackage ./ttrss.nix { inherit (pkgs.webapps) ttrss ttrss-plugins; - env = myconfig.env.tools.ttrss; + env = config.myEnv.tools.ttrss; }; kanboard = pkgs.callPackage ./kanboard.nix { - env = myconfig.env.tools.kanboard; + env = config.myEnv.tools.kanboard; }; wallabag = pkgs.callPackage ./wallabag.nix { inherit (pkgs.webapps) wallabag; - env = myconfig.env.tools.wallabag; + env = config.myEnv.tools.wallabag; }; yourls = pkgs.callPackage ./yourls.nix { inherit (pkgs.webapps) yourls yourls-plugins; - env = myconfig.env.tools.yourls; + env = config.myEnv.tools.yourls; }; rompr = pkgs.callPackage ./rompr.nix { inherit (pkgs.webapps) rompr; - env = myconfig.env.tools.rompr; + env = config.myEnv.tools.rompr; }; shaarli = pkgs.callPackage ./shaarli.nix { - env = myconfig.env.tools.shaarli; + env = config.myEnv.tools.shaarli; }; dokuwiki = pkgs.callPackage ./dokuwiki.nix { inherit (pkgs.webapps) dokuwiki dokuwiki-plugins; }; ldap = pkgs.callPackage ./ldap.nix { inherit (pkgs.webapps) phpldapadmin; - env = myconfig.env.tools.phpldapadmin; + env = config.myEnv.tools.phpldapadmin; }; cfg = config.myServices.websites.tools.tools; diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix index 68c3a10..36a949c 100644 --- a/modules/private/websites/tools/tools/kanboard.nix +++ b/modules/private/websites/tools/tools/kanboard.nix @@ -37,8 +37,8 @@ rec { define('LDAP_USERNAME', '${env.ldap.dn}'); define('LDAP_PASSWORD', '${env.ldap.password}'); define('LDAP_USER_BASE_DN', '${env.ldap.base}'); - define('LDAP_USER_FILTER', '(&(memberOf=cn=users,cn=kanboard,ou=services,dc=immae,dc=eu)(uid=%s))'); - define('LDAP_GROUP_ADMIN_DN', 'cn=admins,cn=kanboard,ou=services,dc=immae,dc=eu'); + define('LDAP_USER_FILTER', '${env.ldap.filter}'); + define('LDAP_GROUP_ADMIN_DN', '${env.ldap.admin_dn}'); ?> ''; }]; diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix index 28041ba..0f1ae7b 100644 --- a/modules/private/websites/tools/tools/shaarli.nix +++ b/modules/private/websites/tools/tools/shaarli.nix @@ -42,7 +42,7 @@ in rec { SetEnv SHAARLI_LDAP_DN "${env.ldap.dn}" SetEnv SHAARLI_LDAP_HOST "ldaps://${env.ldap.host}" SetEnv SHAARLI_LDAP_BASE "${env.ldap.base}" - SetEnv SHAARLI_LDAP_FILTER "${env.ldap.search}" + SetEnv SHAARLI_LDAP_FILTER "${env.ldap.filter}" ''; }]; phpFpm = rec { diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix index 598cc3a..4a9b8ca 100644 --- a/modules/private/websites/tools/tools/ttrss.nix +++ b/modules/private/websites/tools/tools/ttrss.nix @@ -73,14 +73,14 @@ rec { define('SMTP_FROM_ADDRESS', 'ttrss@tools.immae.eu'); define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours'); - define('LDAP_AUTH_SERVER_URI', 'ldap://ldap.immae.eu:389/'); + define('LDAP_AUTH_SERVER_URI', 'ldap://${env.ldap.host}:389/'); define('LDAP_AUTH_USETLS', TRUE); define('LDAP_AUTH_ALLOW_UNTRUSTED_CERT', TRUE); - define('LDAP_AUTH_BASEDN', 'dc=immae,dc=eu'); + define('LDAP_AUTH_BASEDN', '${env.ldap.base}'); define('LDAP_AUTH_ANONYMOUSBEFOREBIND', FALSE); - define('LDAP_AUTH_SEARCHFILTER', '(&(memberOf=cn=users,cn=ttrss,ou=services,dc=immae,dc=eu)(|(cn=???)(uid=???)(&(uid:dn:=???)(ou=ttrss))))'); + define('LDAP_AUTH_SEARCHFILTER', '${env.ldap.filter}'); - define('LDAP_AUTH_BINDDN', 'cn=ttrss,ou=services,dc=immae,dc=eu'); + define('LDAP_AUTH_BINDDN', '${env.ldap.dn}'); define('LDAP_AUTH_BINDPW', '${env.ldap.password}'); define('LDAP_AUTH_LOGIN_ATTRIB', 'immaeTtrssLogin'); diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix index 8572d64..2d152b2 100644 --- a/modules/private/websites/tools/tools/wallabag.nix +++ b/modules/private/websites/tools/tools/wallabag.nix @@ -48,16 +48,16 @@ rec { redis_password: null sites_credentials: { } ldap_enabled: true - ldap_host: ldap.immae.eu + ldap_host: ${env.ldap.host} ldap_port: 636 ldap_tls: false ldap_ssl: true ldap_bind_requires_dn: true - ldap_base: 'dc=immae,dc=eu' - ldap_manager_dn: 'cn=wallabag,ou=services,dc=immae,dc=eu' + ldap_base: '${env.ldap.base}' + ldap_manager_dn: '${env.ldap.dn}' ldap_manager_pw: ${env.ldap.password} - ldap_filter: '(&(memberOf=cn=users,cn=wallabag,ou=services,dc=immae,dc=eu))' - ldap_admin_filter: '(&(memberOf=cn=admins,cn=wallabag,ou=services,dc=immae,dc=eu)(uid=%s))' + ldap_filter: '${env.ldap.filter}' + ldap_admin_filter: '${env.ldap.admin_filter}' ldap_username_attribute: uid ldap_email_attribute: mail ldap_name_attribute: cn diff --git a/modules/private/websites/tools/tools/ympd.nix b/modules/private/websites/tools/tools/ympd.nix index b54c486..72d45d4 100644 --- a/modules/private/websites/tools/tools/ympd.nix +++ b/modules/private/websites/tools/tools/ympd.nix @@ -2,7 +2,7 @@ let ympd = rec { config = { - webPort = "localhost:${env.listenPort}"; + webPort = "localhost:${toString env.listenPort}"; host = env.mpd.host; port = env.mpd.port; }; diff --git a/modules/private/websites/tools/tools/yourls.nix b/modules/private/websites/tools/tools/yourls.nix index 0a8e837..6280e78 100644 --- a/modules/private/websites/tools/tools/yourls.nix +++ b/modules/private/websites/tools/tools/yourls.nix @@ -28,10 +28,10 @@ rec { define( 'YOURLS_DEBUG', false ); define( 'YOURLS_URL_CONVERT', 36 ); $yourls_reserved_URL = array(); - define( 'LDAPAUTH_HOST', 'ldaps://ldap.immae.eu' ); + define( 'LDAPAUTH_HOST', 'ldaps://${env.ldap.host}' ); define( 'LDAPAUTH_PORT', '636' ); - define( 'LDAPAUTH_BASE', 'dc=immae,dc=eu' ); - define( 'LDAPAUTH_SEARCH_USER', 'cn=yourls,ou=services,dc=immae,dc=eu' ); + define( 'LDAPAUTH_BASE', '${env.ldap.base}' ); + define( 'LDAPAUTH_SEARCH_USER', '${env.ldap.dn}' ); define( 'LDAPAUTH_SEARCH_PASS', '${env.ldap.password}' ); define( 'LDAPAUTH_GROUP_ATTR', 'memberof' ); -- cgit v1.2.3