X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fether%2Fdefault.nix;h=d5c65a94d742af82cb9230cebeb812da0b33860e;hb=4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0;hp=50446fffc8a316c96517e656452ab59673e5c449;hpb=d3e4c366c35c8118e6eef0ea4403a422d39cb2bf;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/tools/ether/default.nix b/modules/private/websites/tools/ether/default.nix index 50446ff..d5c65a9 100644 --- a/modules/private/websites/tools/ether/default.nix +++ b/modules/private/websites/tools/ether/default.nix @@ -15,19 +15,16 @@ in { services.duplyBackup.profiles.etherpad-lite = { rootDir = "/var/lib/private/etherpad-lite"; }; - secrets.keys = [ - { - dest = "webapps/tools-etherpad-apikey"; + secrets.keys = { + "webapps/tools-etherpad-apikey" = { permissions = "0400"; text = env.api_key; - } - { - dest = "webapps/tools-etherpad-sessionkey"; + }; + "webapps/tools-etherpad-sessionkey" = { permissions = "0400"; text = env.session_key; - } - { - dest = "webapps/tools-etherpad"; + }; + "webapps/tools-etherpad" = { permissions = "0400"; text = '' { @@ -88,6 +85,10 @@ in { "percentageToScrollWhenUserPressesArrowUp": 0 }, "users": { + "admin": { + "password": "${env.adminPassword}", + "is_admin": true + }, "ldapauth": { "hash": "invalid", "url": "ldaps://${env.ldap.host}", @@ -104,6 +105,27 @@ in { "anonymousReadonly": false } }, + "ep_mypads": { + "warning": "This hash is stored in database, changing anything here will not have any consequence", + "ldap": { + "url": "ldaps://${env.ldap.host}", + "bindDN": "${env.ldap.dn}", + "bindCredentials": "${env.ldap.password}", + "searchBase": "${env.ldap.base}", + "searchFilter": "${env.ldap.filter}", + "properties": { + "login": "uid", + "email": "mail", + "firstname": "givenName", + "lastname": "sn" + }, + "defaultLang": "fr" + } + }, + "ep_comments_page": { + "displayCommentAsIcon": true, + "highlightSelectedText": true + }, "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"], "loadTest": false, "indentationOnNewLine": false, @@ -127,14 +149,23 @@ in { "logconfig" : { "appenders": [ { "type": "console" } ] } } ''; - } - ]; + }; + }; services.etherpad-lite = { enable = true; - modules = builtins.attrValues pkgs.webapps.etherpad-lite-modules; - sessionKeyFile = "/var/secrets/webapps/tools-etherpad-sessionkey"; - apiKeyFile = "/var/secrets/webapps/tools-etherpad-apikey"; - configFile = "/var/secrets/webapps/tools-etherpad"; + package = pkgs.webapps.etherpad-lite.withModules (p: [ + p.ep_align p.ep_bookmark p.ep_colors p.ep_comments_page + p.ep_cursortrace p.ep_delete_empty_pads p.ep_embedmedia + p.ep_font_size p.ep_headings2 p.ep_immae_buttons p.ep_ldapauth + p.ep_line_height p.ep_markdown p.ep_mypads p.ep_page_view + p.ep_previewimages p.ep_ruler p.ep_scrollto + p.ep_set_title_on_pad p.ep_subscript_and_superscript + p.ep_timesliderdiff + ]); + modules = []; + sessionKeyFile = config.secrets.fullPaths."webapps/tools-etherpad-sessionkey"; + apiKeyFile = config.secrets.fullPaths."webapps/tools-etherpad-apikey"; + configFile = config.secrets.fullPaths."webapps/tools-etherpad"; }; systemd.services.etherpad-lite.serviceConfig.SupplementaryGroups = "keys";